Merge branch...

Merge branch '68-roc-and-cmc-curves-do-not-follow-the-standard-of-the-handbook-of-face-recognition' of https://gitlab.idiap.ch/bob/bob.bio.base into 68-roc-and-cmc-curves-do-not-follow-the-standard-of-the-handbook-of-face-recognition

Conflicts:
	bob/bio/base/script/evaluate.py