Merge remote-tracking branch 'origin/72X_v1' into CMSSW_7_2_X

Conflicts:
	CatProducer/prod/PAT2CAT_cfg.py
	CatProducer/python/Tools/tools.py
	CatProducer/python/catEventContent_cff.py
	CatProducer/python/catTemplate_cfg.py
	CatProducer/python/electronProducer_cfi.py
	README.md