master
Make a set of material files for tracker which does not complain about 'the sum of components do not add to 1' for 2016 setup
Attempt to make 2017 scenario compatible with dd4hep
Zero material scenario from Giacomo
Fixed duplicate definitions of Phase 1 materials (FPix_CFSkin and cie). Same name but different composition in second definition. This resulted in discrepancies in the DDD <-> DD4hep materials comparison: in DDD the first definition was taken, in DD4hep the second. Chose the composition contaning H and O in addition to C (a carbon fiber with C only does not seem realistic).