Added calibration
Added ConfigCalibration storage
Deleted some comments
Some housekeeping
Merge branch 'master' into HEAD