Merge branch 'master' into 2.1.0

Conflicts:
	dist/apidocs/data.json
	dist/demo/animation/dom.html
	dist/demo/chart/dom.html
	dist/demo/draggableConnectors/dom.html
	dist/demo/dynamicAnchors/dom.html
	dist/demo/flowchart/dom.html
	dist/demo/perimeterAnchors/dom.html
	dist/demo/sourcesAndTargets/dom.html
	dist/demo/statemachine/dom.html
	dist/doc/changelog.html
	dist/js/jsPlumb-2.0.6.js
	dist/js/jsPlumb-2.0.7-min.js
	dist/js/jsPlumb-2.0.7.js
	dist/js/jsPlumb-2.1.0.js
	dist/tests/loadtest-dom.html
	dist/tests/qunit-svg-dom-instance.html
	doc/wiki/changelog.md
	jekyll/_config.yml
	package.json

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jsPlumb",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "ignore": [
     "demo",
     "dist/apidocs",
@@ -31,7 +31,7 @@
     "test"
   ],
   "main": [
-    "dist/js/jsPlumb-2.0.6.js"
+    "dist/js/jsPlumb-2.0.7.js"
   ],
   "homepage": "http://jsplumbtoolkit.com",
   "authors": [

package.json

@@ -67,8 +67,8 @@
         "Demonstrates the various options for defining and working with Groups"
     ]
   ],
-  "author": "jsPlumb (hello@jsplumbtoolkit.com)",
-  "license": "MIT/GPL2",
+  "author": "Simon Porritt",
+  "license": "(MIT OR GPL-2.0)",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.5.0",