Catalog tree refactoring
Merge pull request #396 from geoadmin/dev_catalogtree_refactoring

Catalog tree refactoring