Update changelog
Merge branch 'master' of https://github.com/mar10/fancytree

Conflicts:
	CHANGELOG.md
Update changelog
Merge branch 'master' of https://github.com/mar10/fancytree

Conflicts:
	demo/sample-multi-ext.html
	src/jquery.fancytree.edit.js
	src/jquery.fancytree.js
	src/jquery.fancytree.persist.js