added configuration treebuilder
Merge branch 'config'