Merge branch 'master' into develop

2017-09-13 16:06:34 +02:00
parent 6ed1b084ce 85bd1861d6
commit a9e3130ef6
56 changed files with 385 additions and 303 deletions
@@ -53,13 +53,10 @@
    "systemjs": "0.19.41",
    "zone.js": "^0.7.2"
  },
-  "engines": {
-    "node": "4.x",
-    "npm": "2.14.x"
-  },
  "scripts": {
    "build": "./node_modules/grunt-cli/bin/grunt",
-    "test": "./node_modules/grunt-cli/bin/grunt test"
+    "test": "./node_modules/grunt-cli/bin/grunt test",
+    "dev": "./node_modules/grunt-cli/bin/grunt && ./node_modules/grunt-cli/bin/grunt watch"
  },
  "license": "Apache-2.0",
  "dependencies": {