minor changes
Merge branch 'master' of https://github.com/mar10/fancytree.git

Conflicts:
	src/jsdoc-globals.js