fixing conflicts
fixing conflicts
cleaning up
Merge branch 'master' into bloomir
Regression test to verify relative recall
Merge branch 'bloomir' of https://github.com/nasadi/Ivory into nasadi-bloomir

Conflicts:
	src/java/attic/ivory/core/driver/PreprocessFieldCollection.java