backup
Merge branch 'master' of https://github.com/nextsw/calibration

Conflicts:
	calibration/ArtModules/PMTCalibration_module.cc