Merge remote-tracking branch 'origin/temp8' into temp8-3130-examine-indexing-variant-switching

# Conflicts:
#	src/Umbraco.Tests/Services/ContentServiceTests.cs

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -324,8 +324,6 @@
     <Content Include="Umbraco\Developer\RelationTypes\Images\Refresh.gif" />
     <Content Include="Umbraco\Developer\RelationTypes\NewRelationType.aspx" />
     <Content Include="Umbraco\Developer\RelationTypes\RelationTypesWebService.asmx" />
-    <Content Include="Umbraco\Developer\RelationTypes\TreeMenu\ActionDeleteRelationType.js" />
-    <Content Include="Umbraco\Developer\RelationTypes\TreeMenu\ActionNewRelationType.js" />
     <Content Include="Umbraco\Dialogs\ChangeDocType.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>

src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js

@@ -1,21 +0,0 @@
-function actionDeleteRelationType(relationTypeId, relationTypeName) {
-
-    if (confirm('Are you sure you want to delete "' + relationTypeName + '"?')) {
-        $.ajax({
-            type: "POST",
-            url: "developer/RelationTypes/RelationTypesWebService.asmx/DeleteRelationType",
-            data: "{ 'relationTypeId' : '" + relationTypeId + "' }",
-            contentType: "application/json; charset=utf-8",
-            dataType: "json",
-            success: function (data) {
-                UmbClientMgr.mainTree().refreshTree('relationTypes');
-                UmbClientMgr.appActions().openDashboard('developer');
-            },
-            error: function (data) { }
-        });
-
-    }
-   
-}
-
-

src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js

@@ -1,3 +0,0 @@
-function actionNewRelationType() {
-    UmbClientMgr.openModalWindow('developer/RelationTypes/NewRelationType.aspx', 'Create New RelationType', true, 400, 300, 0, 0);
-}