new tau fake rate SF
Merge branch 'master' of https://github.com/UHHAnalysis/SFrameTools

Conflicts:
	Makefile
	include/MCDataScaleFactors.h
	include/Utils.h
	src/MCDataScaleFactors.cxx
Merge branch 'master' of https://github.com/UHHAnalysis/SFrameTools
added flavor uncertainty to tau lepton SF
Merge branch 'master' of https://github.com/marmeyer/SFrameTools into marmeyer-master

Conflicts:
	include/MCDataScaleFactors.h
	include/Utils.h
	src/MCDataScaleFactors.cxx
Merge branch 'marmeyer-master'