small fix
Merge branch 'edm-recoecalfit-CMSSW_5_3_12' of github.com:emanueledimarco/cmssw into edm-recoecalfit-CMSSW_5_3_12

Conflicts:
	RecoLocalCalo/EcalRecAlgos/test/makeLaserPulseTemplates.cc
readd a file removed by mistake