fixed merge issue
automatically updated version patch number
added anonymous namespace to fix issue with same class name in mulitple classes
added hitStrategy call back to the confusion matrix calculation so custom counts can be done
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into feature-installer

Conflicts:
	src/easy/evaluate.py
automatically updated version patch number
cleaned up the defaultHitStrategy function and replaced precision with 1 - FPR or true negative hit rate. Also changed score to not include recall if no true positives and not include trueNegRate if no true negatives.
Merge commit '5bb45f0e87b36633678dd4febdbc6eade411d442' into devel
automatically updated version patch number
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC

Conflicts:
	CMakeLists.txt
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC into feature-docupdate