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

package.json

@@ -53,10 +53,6 @@
     "systemjs": "0.19.41",
     "systemjs": "0.19.41",
     "zone.js": "^0.7.2"
     "zone.js": "^0.7.2"
   },
   },
-  "engines": {
-    "node": "4.x",
-    "npm": "2.14.x"
-  },
   "scripts": {
   "scripts": {
     "build": "./node_modules/grunt-cli/bin/grunt",
     "build": "./node_modules/grunt-cli/bin/grunt",
     "test": "./node_modules/grunt-cli/bin/grunt test",
     "test": "./node_modules/grunt-cli/bin/grunt test",