Merge branch 'file-datastore'

Conflicts:
src/net/vl0w/isd/model/Result.java
test/net/vl0w/isd/store/InMemoryDataStoreTest.java
Serialization for storable result