GenTauCPProducer, CPQuantities: Generalizing the calculation of CP-quantities
Merge branch 'master' into gen-taudecay