Only render templates in tree when the node is expanded.
Merge branch 'dataSourceBrowser' into uberbranch