Merge branch 'master' of https://github.com/biometrics/openbr into attributes

Conflicts:
	openbr/plugins/distance.cpp
	openbr/plugins/template.cpp
Merge branch 'attributes' of https://github.com/biometrics/openbr into AttributesVSFaceRecognition