first version for miniAOD
PF muon producer
Merge branch '70X_v2' of github.com:vallot/CATTools into 70X_v1
Merge branch 'CMSSW_5_3_X' into CMSSW_7_2_X

Conflicts:
	CatProducer/BuildFile.xml
	CatProducer/prod/PAT2CAT_cfg.py
	CatProducer/python/CATMuonProducer_cfi.py
changes for 7X
CATElectronProducer.cc typo
typo CATElectronProducer.cc
temp
temp
bugfix
bugfix
Update README.md
Update README.md
Merge branch 'CMSSW_5_3_X' into CMSSW_7_2_X

Conflicts:
	README.md
updating for CMSSW_7_2_X
Merge branch 'CMSSW_7_2_X' of github.com:jshlee/CATTools into CMSSW_7_2_X

Conflicts:
	CatProducer/prod/crab/runCatupling.py
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
bug fix to merge
simplify producers
bug fixes to get it working