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

src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js

@@ -33,6 +33,14 @@ angular.module("umbraco.directives.html")
                 else {
                     scope.labelstring = scope.label;
                 }
+
+                if (scope.description && scope.description[0] === "@") {
+                    scope.descriptionstring = localizationService.localize(scope.description.substring(1));
+                }
+                else {
+                    scope.descriptionstring = scope.description;
+                }
+
             }
         };
     });

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

@@ -3,7 +3,7 @@
         <div class="umb-el-wrap">
             <label ng-if="hideLabel!=='true'" class="control-label" for="{{alias}}">
                 {{labelstring}}
-                    <small>{{description}}</small>
+                    <small>{{descriptionstring}}</small>
             </label>
 
             <div class="controls controls-row" ng-transclude>