Merge remote-tracking branch 'origin/develop' into develop

README.md

@@ -258,7 +258,7 @@ Install the application dependencies via npm:
 
 The application can be bundled and minified:
 
-    browserify app.js -o app-bundle.js
+    browserify app.js -o app-bundle.js -t babelify 
     uglifyjs app-bundle.js -o app-bundle.min.js
 
 And loaded into a webpage:

bower.json

@@ -4,6 +4,7 @@
   "main": ["dist/vis.min.js", "dist/vis.min.css"],
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
+  "license": ["Apache-2.0", "MIT"],
   "repository": {
     "type": "git",
     "url": "git://github.com/almende/vis.git"

package.json

@@ -3,6 +3,7 @@
   "version": "4.0.1-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
+  "license": ["Apache-2.0", "MIT"],
   "repository": {
     "type": "git",
     "url": "git://github.com/almende/vis.git"