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

Conflicts:
	openbr/core/core.cpp
Merge branch 'streamlining' of https://github.com/biometrics/openbr into streamlining

Conflicts:
	openbr/core/core.cpp
Fixed some things