Conflicts resolved. Number of events set to 10000
Merge branch 'PixelValidationCodeRedesign-CMSSW_7_2_0_pre3' of github.com:cirkovic/my-cmssw into PixelValidationCodeRedesign-CMSSW_7_2_0_pre3