reimplementing jonprindivilles jstree fix #2270
Merge pull request #2574 from daegun/jstree

reimplementing jonprindivilles jstree fix #2270