Merging
Merge
Merge branch 'master' of https://github.com/biometrics/openbr
Merge branch 'master' of https://github.com/biometrics/openbr
PP5 fix, file::flat() and init() tweaks