updates
Merge branch 'master' of https://github.com/CMSElectronStream/StreamForElectrons

Conflicts:
	ReReco/dump_step2_RAW2DIGI_L1Reco_RECO_onStream.py