fix tree and owners
owner commt add owner/edit > owner/mnager
Merge branch 'origin/master'