;
Merge branch 'master' of https://github.com/coding-idiot/jsPlumb-Persistence

Conflicts:
	dom.html
	dynamic.html
	dynamic.js
	load.html
	load.js
	save.js