tweak: move "consolidation" tab with "aggregation"
Merge branch 'develop' of github.com:capensis/canopsis into develop