name change, added Z1jet sample
Merge branch 'master' of https://github.com/uwcms/FinalStateAnalysis
Tracking A->Zh updates
Ntup.out for Ntuple submission reference
conflicting?
Removed old PatTuple variables
Merge branch 'svfit_extras'

Conflicts:
	MetaData/python/data8TeV.py
	MetaData/python/data8TeVNew.py
	MetaData/scripts/get_mc_lumi.py
	MetaData/tuples/PATTuples-8TeV.json
	NtupleTools/python/templates/cleaning.py
	NtupleTools/python/templates/taus.py
	PlotTools/python/RebinView.py
	PlotTools/scripts/pick_fsa_events.py
	TagAndProbe/src/ScaleFactorsMuEG201253X.cc