Merge branch 'dev-v7' into temp8

# Conflicts:
#	.github/README.md
#	src/Umbraco.Core/Constants-PropertyEditors.cs
#	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs

.github/README.md

@@ -1,4 +1,5 @@
 _You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
+[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
 
 _Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._
 

src/Umbraco.Web.UI.Client/src/common/resources/relation.resource.js

@@ -26,7 +26,7 @@ function relationResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "relationApiBaseUrl",
                         "GetByChildId",
-                        [{ childId: id, relationTypeAlias: alias }])),
+                        { childId: id, relationTypeAlias: alias })),
                 "Failed to get relation by child ID " + id + " and type of " + alias);
         },
 

src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js

@@ -85,7 +85,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
             $scope.miniListView = node;
         }
 
-        relationResource.getByChildId($scope.source.id, "relateParentDocumentOnDelete").then(function (data) {
+        relationResource.getByChildId($scope.source.id, "relateParentMediaFolderOnDelete").then(function (data) {
             $scope.loading = false;
 
             if (!data.length) {