Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

src/Umbraco.Web.UI.Client/src/views/common/main.controller.js

@@ -9,11 +9,15 @@
  * 
  */
 function MainController($scope, $routeParams, $rootScope, $timeout, notificationsService, userService, navigationService, legacyJsLoader) {
+    //debugmode so I can easily turn on/off json output of property models:
+    //TODO: find a better way
+    $scope.$umbdebugmode = true;
+
     //set default properties
     
     //the null is important because we do an explicit bool check on this in the view    
-    $scope.authenticated = null; 
-    
+    $scope.authenticated = null;
+
     //subscribes to notifications in the notification service
     $scope.notifications = notificationsService.current;
     $scope.$watch('notificationsService.current', function (newVal, oldVal, scope) {

src/Umbraco.Web.UI.Client/src/views/directives/umb-editor.html

@@ -1,3 +1,11 @@
 <div>    
-    <ng-include src="propertyEditorView"></ng-include>	    
-</div>
+    <ng-include src="propertyEditorView"></ng-include>
+
+<div ng-show="{$umbdebugmode}" style="clear: both">
+<pre>
+{{model | json}}
+</pre>
+</div>
+
+</div>
+