Merge branch '70X_v1' into CMSSW_7_2_X

Conflicts:
	CatProducer/plugins/CATElectronProducer.cc
	CatProducer/python/Tools/tools.py
	CatProducer/python/electronProducer_cfi.py
	DataFormats/interface/Electron.h