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

Conflicts:
	AnalyzerEle/plugins/AnalyzerEle.cc
updates
updates