Merge branch 'dev-v8' into temp-U4-11127

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

src/Umbraco.Web.UI.Client/package.json

@@ -2,7 +2,7 @@
   "author": "Umbraco HQ",
   "name": "umbraco",
   "homepage": "https://github.com/umbraco/umbraco-cms/",
-  "version": "7.1.2",
+  "version": "0.0.0",
   "license": "MIT",
   "repository": {
     "type": "git",

src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js

@@ -1,8 +1,6 @@
 
 LazyLoad.js([
   '../lib/jquery/jquery.min.js',
-  //'../lib/jquery-ui/jquery-ui.min.js',
-  '/Scripts/jquery-1.6.4.min.js',
   '../lib/angular/1.1.5/angular.min.js',
   '../lib/underscore/underscore-min.js',
   '../lib/umbraco/Extensions.js',
@@ -13,9 +11,8 @@ LazyLoad.js([
   '../ServerVariables',
   '../lib/spectrum/spectrum.js',
   '../lib/signalr/jquery.signalR.js',
-  '/umbraco/signalr/hubs',
+  '/umbraco/BackOffice/signalr/hubs',
   '../js/umbraco.canvasdesigner.js'
-  '../js/canvasdesigner.panel.js'
 ], function () {
   jQuery(document).ready(function () {
     angular.bootstrap(document, ['Umbraco.canvasdesigner']);

src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

@@ -18,7 +18,7 @@ function startUpVideosDashboardController($scope, xmlhelper, $log, $http) {
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController);
 
 
-function startUpDynamicContentController($scope, $timeout, dashboardResource, assetsService, tourService, eventsService) {
+function startUpDynamicContentController($timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
     var vm = this;
     var evts = [];
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js

@@ -66,6 +66,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         showOpenButton: false,
         showEditButton: false,
         showPathOnHover: false,
+        maxNumber: 1,
+        minNumber : 0,
         startNode: {
             query: "",
             type: "content",

src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html

@@ -28,7 +28,7 @@
             <localize key="general_add">Add</localize>
         </a>
 
-        <div class="umb-contentpicker__min-max-help">
+        <div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true">
 
             <!-- Both min and max items -->
             <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber !== model.config.maxNumber">