edit category tree, add edit views
Merge remote-tracking branch 'origin/asadi'