Fix problem.
Merge github.com:geonmo/KrAFT into jpsi_update2

Conflicts:
	Configuration/python/ntuple_template_cff.py