Merge branch 'netcore/netcore' into netcore/feature/migrate-logging

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

@@ -627,21 +627,8 @@ angular.module("umbraco")
 
             }
 
-
+            $scope.setUniqueId = function () {
-            var guid = (function () {
+                return String.CreateGuid();
-                function s4() {
-                    return Math.floor((1 + Math.random()) * 0x10000)
-                        .toString(16)
-                        .substring(1);
-                }
-                return function () {
-                    return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-                        s4() + "-" + s4() + s4() + s4();
-                };
-            })();
-
-            $scope.setUniqueId = function (cell, index) {
-                return guid();
             };
 
             $scope.addControl = function (editor, cell, index, initialize) {