cleaned up gallery/enrollment logic
Merge branch 'master' of https://github.com/biometrics/openbr