new logical column. Added hierarchies
Merge branch 'project1'
corrected bug with calculated columns