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