CPQuantities: New way to calculate PhiStarCP for RecoTauCPProducer
Merge branch 'master' of https://github.com/cms-analysis/HiggsAnalysis-KITHiggsToTauTau

Conflicts:
	src/Calculations/CPQuantities.cc
	src/Producers/RecoTauCPProducer.cc
Finished implementation of PhiStarCP on reco level