small progress on topic tree editor
auto-pulled latest wagn code
auto-pulled latest wagn code
fixed distro bug
resolved merge conflicts
fixed duplicate green
Merge branch 'master' into stable