Merge remote-tracking branch 'origin/dev-v7' into 7.3.0

Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/umbraco.presentation/content.cs

src/Umbraco.Web.UI.Client/src/less/forms.less

@@ -794,3 +794,17 @@ legend + .control-group {
     position: relative;
     z-index: 1000;
 }
+
+
+
+@media (max-width: 767px) {
+
+  // Labels on own row
+  .form-horizontal .control-label {
+    width: 100%;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+
+}

src/Umbraco.Web.UI.Client/src/less/main.less

@@ -146,7 +146,7 @@ h5{
 
 .controls-row {
   padding-top: 5px;
-  margin-left: 240px !important;
+  margin-left: 240px;
 }
 .controls-row label {
   display: inline-block

src/Umbraco.Web.UI.Client/src/less/panel.less

@@ -37,11 +37,6 @@
     bottom: 31px !important;
 }
 
-/*
-.umb-tab-buttons.umb-bottom-bar {
-    bottom: 50px !important;
-}*/
-
 .umb-panel-header .umb-headline, .umb-panel-header h1 {
   font-size: 16px;
   border: none;
@@ -153,27 +148,27 @@
 /* tab buttons */
 .umb-bottom-bar{
     background: white;
-
     -webkit-box-shadow: 0px -18px 20px rgba(255, 255, 255, 1);
     -moz-box-shadow:    0px -18px 20px rgba(255, 255, 255, 1);
     box-shadow:         0px -18px 20px rgba(255, 255, 255, 1);
-
     border-top: 1px solid @grayLighter;
-
     padding: 10px 0 10px 0;
-
     position: fixed;
     bottom: 0px;
     left: 100px;
-    right: 20px;
     z-index: 6010;
-};
-
-@media (min-width: 1101px) {
-    .umb-bottom-bar {left: 460px;}
 }
 
-.umb-tab-buttons{padding-left: 240px;}
+.umb-tab-buttons{
+    padding-left: 0px;
+}
+
+@media (min-width: 1101px) {
+    .umb-bottom-bar {
+        left: 460px;
+    }    
+}
+
 .umb-tab-pane{padding-bottom: 90px}
 
 .tab-content{overflow: visible; }

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

@@ -18,9 +18,16 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
     //map the user config
     $scope.model.config = angular.extend(config, $scope.model.config);
 
+    $scope.datetimePickerValue = $scope.model.value;
+
     //hide picker if clicking on the document 
     $scope.hidePicker = function () {
-        $element.find("div:first").datetimepicker("hide");
+        //$element.find("div:first").datetimepicker("hide");
+        // Sometimes the statement above fails and generates errors in the browser console. The following statements fix that.
+        var dtp = $element.find("div:first");
+        if (dtp && dtp.datetimepicker) {
+            dtp.datetimepicker("hide");
+        }
     };
     $(document).bind("click", $scope.hidePicker);
 
@@ -67,8 +74,16 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
 					.datetimepicker($scope.model.config)
 					.on("dp.change", applyDate);
 
-				//manually assign the date to the plugin
-				$element.find("div:first").datetimepicker("setValue", $scope.model.value ? $scope.model.value : null);
+			    //manually assign the date to the plugin
+				if (!$scope.model.config.format) {
+				    $element.find("div:first").datetimepicker("setValue", $scope.model.value ? $scope.model.value : null);
+				}
+				else {
+				    $element.find("div:first").datetimepicker("setValue", $scope.model.value ? new Date($scope.model.value) : null);
+				    if ($scope.model.value && $scope.model.config.format) {
+				        $scope.datetimePickerValue = moment($scope.model.value).format($scope.model.config.format);
+				    }
+				}
 
 				//Ensure to remove the event handler when this instance is destroyted
 				$scope.$on('$destroy', function () {

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

@@ -1,7 +1,7 @@
 <div class="umb-editor umb-datepicker" ng-controller="Umbraco.PropertyEditors.DatepickerController">
     <div class="input-append date datepicker" style="position: relative;" id="datepicker{{model.alias}}">        
         <input  name="datepicker" data-format="{{model.config.format}}" type="text" 
-                ng-model="model.value"   
+                ng-model="datetimePickerValue"   
                 ng-required="model.validation.mandatory"   
                 val-server="value" />
         <span class="add-on">