Merge branch 'master' of github.com:thingsboard/thingsboard

ui/package.json

@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "start": "babel-node --max_old_space_size=4096 server.js",
-    "build": "NODE_ENV=production webpack -p"
+    "build": "cross-env NODE_ENV=production webpack -p"
   },
   "dependencies": {
     "@flowjs/ng-flow": "^2.7.1",
@@ -89,6 +89,7 @@
     "babel-preset-react": "^6.16.0",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^3.0.1",
+    "cross-env": "^3.2.4",
     "css-loader": "^0.25.0",
     "eslint": "^3.4.0",
     "eslint-config-angular": "^0.5.0",

ui/src/app/locale/locale.constant.js

@@ -693,7 +693,7 @@ export default angular.module('thingsboard.locale', [])
                     "title-required": "Widget title is required.",
                     "type": "Widget type",
                     "resources": "Resources",
-                    "resource-url": "JavaScript/CSS URI",
+                    "resource-url": "JavaScript/CSS URL",
                     "remove-resource": "Remove resource",
                     "add-resource": "Add resource",
                     "html": "HTML",