added category tree structure
Merge branch 'refs/heads/feature-models-categories' into feature-models
Merge branch 'refs/heads/feature-models'