Fix a little arborjs
Merge branch 'master' of https://github.com/luongm/ISG_2.0