Merge branch 'dev-v7.8' into temp-U4-10707

# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Web.UI.Client/src/common/services/tour.service.js

@@ -20,7 +20,7 @@
             tours = [];
             return tourResource.getTours().then(function(tourFiles) {
                 angular.forEach(tourFiles, function (tourFile) {
-                    angular.forEach(tourFile, function(newTour) {
+                    angular.forEach(tourFile.tours, function(newTour) {
                         validateTour(newTour);
                         validateTourRegistration(newTour);
                         tours.push(newTour);    

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js

@@ -22,6 +22,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	        selectedSearchResults: []
 	    };
 
+            $scope.showTarget = $scope.model.hideTarget !== true;
+
 	    if (dialogOptions.currentTarget) {
 	        $scope.model.target = dialogOptions.currentTarget;
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html

@@ -18,7 +18,7 @@
             ng-model="model.target.name" />
     </umb-control-group>
 
-    <umb-control-group label="@content_target">
+    <umb-control-group ng-if="showTarget" label="@content_target">
         <label class="checkbox no-indent">
             <input type="checkbox" ng-model="model.target.target" ng-true-value="_blank" ng-false-value="" /> <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
         </label>