Merge branch 'master-emulsion' into 'master'

...meter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py

Control/CalypsoCommon/python/GlobalFlags.py

Control/CalypsoConfiguration/python/DetectorConfigFlags.py

...ample/GenEventExample/python/GenEventReadExampleConfig.py

.../CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py

...ypsoExample/RDOReadExample/python/RDOReadExampleConfig.py

Control/CalypsoExample/SimHitExample/CMakeLists.txt

Control/CalypsoExample/SimHitExample/src/SimHitAlg.cxx

Control/CalypsoExample/SimHitExample/src/SimHitAlg.h

...ataAccessExample/python/TrackerDataAccessExampleConfig.py

...ataAccessExample/python/TriggerDataAccessExampleConfig.py

...taAccessExample/python/WaveformDataAccessExampleConfig.py

Control/CalypsoExample/WriteAlignment/CMakeLists.txt

...ypsoExample/WriteAlignment/python/WriteAlignmentConfig.py

.../CalypsoExample/WriteAlignment/scripts/CopyAlignFolder.sh

...l/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.cxx

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx

...Description/FaserDetDescr/FaserDetDescr/FaserDetectorID.h

DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx

...orDescription/FaserDetDescr/src/FaserDetectorIDHelper.cxx