Merge pull request #3 from gsieber/master

fixed wrongly replaced ids
Added Zs calculation to GenTauCPProducer
Added the Transformation of phiCP and phiStarCP. Option to turn it on is in settingsGenTauCP
Merge remote-tracking branch 'upstream/master'