Merge master into canyonlands

.gitignore

calibrations/calo_digi_canyonlands.json

calibrations/calo_digi_default.json

compact/central_tracker_hybrid_v2.xml

compact/definitions.xml

compact/display.xml

compact/display_geoviewer.xml

compact/drich.xml

compact/ecal_backward_hybrid.xml

compact/erich.xml

compact/materials.xml

compact/optical_materials.xml

compact/subsystem_views/drich_only.xml

compact/tracking_config_canyonlands.xml

src/BarrelCalorimeterInterlayers_geo.cpp

src/DRich_geo.cpp

src/ERich_geo.cpp

src/FieldMapBrBz.cpp

src/FileLoader.cpp

src/HybridCalorimeter_geo.cpp