Merged pilot-geometry from repository ianna
overlaps and materials issues fixed
Merge pull request #3225 from friccita/PilotGeometry71X_bugfix

Geometry -- Pilot geometry71 x bugfix
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X