Merge branch 'calo-calib-2012-sim10' into 'Sim10/2012'
New Ecal and Hcal calibration for 2012 and 2013 sim10
See merge request !123 (merged)
(cherry picked from commit 59dfb205)
c942d283 new Ecal calibration for Sim10 with G4 9.6.p02 and EmOpt2 for 2012-2013 ba42b57e new Hcal calibration for Sim10 with G4 9.6.p02 and EmOpt2 for 2012-2013