Fix reference to datasourceTree.js (closes #81)
Merge branch 'master' into 2.3.0-wip