fixing serialization
Revert "fixing serialization"

This reverts commit cf392b55a5d0a01f70a6a702929140f0c7e40413.

wrong branch
fixing serialization
Revert "Code to preprocess field collections"

This reverts commit 503725ebef23fa030ee7074a4a1cd2b139e93e21.

cleaning up the mess
Revert "fixed distributed cache"

This reverts commit 5a6ab486a24255463f44cb7a5e3383d3055fb72d.

cleaning up the mess
open-source bloomir
regression test
correcting the test
correcting test
Merge branch 'bloomir' of https://github.com/nasadi/Ivory into nasadi-bloomir
Merge branch 'master' into nasadi-bloomir

Conflicts:
	src/java/attic/ivory/core/driver/PreprocessFieldCollection.java
Moved ivory.smrf.retrieval.distributed to attic/
Tweaked build of autogen'ed scripts. Light refactoring.
Removed attempts to build run scripts under windows (doesn't work).
Additional tweak to remove windows-related directives.
fixing conflicts
fixing conflicts
cleaning up
Merge branch 'master' into bloomir
Regression test to verify relative recall