Category tree rewrite
Merge pull request #10 from wtg/4_1_dev

Category tree rewrite