Hcal Phase I

* Merging all branches
* Fix from Sunanda for Phase I