Merge Sunanda's branch

* HGCal geometry