Merge commit 'a935c9d8c362c3d9913af5e90a4e638dcee69a3b' into multiple-indexes

Conflicts:
	src/plugins/Library/index/ProtoIndexSerialiser.java
Fix not persisting removal of bookmark.
Refactor/clarify mergeToDisk()
Refactor and clarify mergeToFreenet() too
Indenting.
Fix generics.
Comments.
Factor out more repetitive disk read code
Don't need to proceed here.
Fix error message.
Logging
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/multiple-indexes'
storing on-disk indexes in different folders per identity/category
Changes needed to use TermFileEntry in Curator