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

bower.json

@@ -4,7 +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"],
+  "license": "(Apache-2.0 OR MIT)",
   "repository": {
     "type": "git",
     "url": "git://github.com/almende/vis.git"

package.json

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