Merge branch 'torrence-calonu' into 'master'

...r/CaloDetDescr/CaloIdDictFiles/data/IdDictCalorimeter.xml

...oDetDescr/CaloIdDictFiles/data/IdDictCalorimeter_TB00.xml

Calorimeter/CaloDetDescr/FaserCaloIdentifier/CMakeLists.txt

...tDescr/FaserCaloIdentifier/FaserCaloIdentifier/CaloNuID.h

...oIdentifier/FaserCaloIdentifier/FaserCaloIdentifierDict.h

...scr/FaserCaloIdentifier/FaserCaloIdentifier/selection.xml

...rimeter/CaloDetDescr/FaserCaloIdentifier/src/CaloNuID.cxx

...meter/CaloDetDescrCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx

...ter/CaloDetDescrCnv/CaloIdCnv/src/CaloNuIDDetDescrCnv.cxx

...meter/CaloDetDescrCnv/CaloIdCnv/src/CaloNuIDDetDescrCnv.h

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h

Calorimeter/CaloRecTools/src/CaloRecTool.cxx

Calorimeter/CaloRecTools/src/CaloRecTool.h

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

...ample/WaveformDataAccessExample/src/RawWaveformAccess.cxx

...Example/WaveformDataAccessExample/src/RawWaveformAccess.h

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx

...cription/FaserDetDescr/FaserDetDescr/FaserDetTechnology.h