Merge branch 'torrence-wavereco' into 'master'

Calorimeter/CaloRecAlgs/CMakeLists.txt

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h

...imeter/CaloRecAlgs/src/components/CaloRecAlgs_entries.cxx

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx

Waveform/WaveRecTools/src/WaveformReconstructionTool.h

xAOD/xAODFaserCalorimeter/CMakeLists.txt

xAOD/xAODFaserCalorimeter/README

...ODFaserCalorimeter/Root/CalorimeterHitAuxContainer_v1.cxx

xAOD/xAODFaserCalorimeter/Root/CalorimeterHit_v1.cxx

xAOD/xAODFaserCalorimeter/Root/dict/ContainerProxies.cxx

xAOD/xAODFaserCalorimeter/Root/xAODFaserCalorimeterCLIDs.cxx

...AODFaserCalorimeter/xAODFaserCalorimeter/CalorimeterHit.h

...rimeter/xAODFaserCalorimeter/CalorimeterHitAuxContainer.h

...alorimeter/xAODFaserCalorimeter/CalorimeterHitContainer.h

xAOD/xAODFaserCalorimeter/xAODFaserCalorimeter/selection.xml

...FaserCalorimeter/versions/CalorimeterHitAuxContainer_v1.h

...AODFaserCalorimeter/versions/CalorimeterHitContainer_v1.h