imports
Merge branch 'dev' of https://github.com/markkerzner/FreeEed into dev
Merge branch 'ivan' into dev
attachments, deduplication, bug fixes
Merge branch 'dev' into mark

Conflicts:
	freeeed-processing/src/main/java/org/freeeed/main/Reduce.java
Merge branch 'dev' into mark
correct test data
fixing missing custodian
Merge branch 'dev' into ivan