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

Conflicts:
	HISTORY.md
	dist/vis.js

HISTORY.md

@@ -1,7 +1,8 @@
 # vis.js history
 http://visjs.org
 
-## 2014-10-21, version 3.6.1
+
+## not yet released, version 3.6.1
 
 ### Timeline
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "3.6.0",
+  "version": "3.6.1-SNAPSHOT",
   "main": ["dist/vis.min.js", "dist/vis.min.css"],
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "3.6.0",
+  "version": "3.6.1-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {