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

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html

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

@@ -35,6 +35,14 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
         $scope.previewDevice = device;
     };
 
+    /*****************************************************************************/
+    /* Exit Preview */
+    /*****************************************************************************/
+
+    $scope.exitPreview = function () {
+        window.top.location.href = "/umbraco/endPreview.aspx?redir=%2f" + $scope.pageId;
+    };
+
     /*****************************************************************************/
     /* UI designer managment */
     /*****************************************************************************/

src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html

@@ -34,6 +34,9 @@
                         <i></i>
                     </a>
                 </li>
+                <li ng-click="exitPreview()">
+                    <a href="#" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
+                </li>                
             </ul>
 
             <ul class="sections" ng-class="{selected: !showDevicesPreview}" ng-if="enableCanvasdesigner > 0">

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html

@@ -1,6 +1,5 @@
 <div ng-controller="Umbraco.Dialogs.LoginController">
-    <div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}">
-
+    <div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}" ng-cloak>
         <div class="form">
             <h1>{{greeting}}</h1>
             <p>