upgrade jstree
Merge branch 'master' into upgrade-jstree