Merge branch 'max' into 'master'

include grunt-contrif-uglify and grunt-wiredep in package.json

See merge request !2

.gitignore

@@ -12,6 +12,7 @@ local.properties
 .settings/
 .loadpath
 .recommenders
+package-lock.json
 
 # External tool builders
 .externalToolBuilders/

package.json

@@ -6,9 +6,11 @@
   "dependencies": {
     "grunt": "^1.0.1",
     "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-uglify": "^3.2.1",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-dust": "^0.9.4",
-    "grunt-dustjs": "^1.4.0"
+    "grunt-dustjs": "^1.4.0",
+    "grunt-wiredep": "^3.0.1"
   },
   "devDependencies": {
     "grunt": "^1.0.1",