More warning fixes
Merge branch 'master' into acl_graph

Conflicts:
	ehri-frames/src/main/java/eu/ehri/project/core/impl/SingleIndexGraphManager.java
Remove some now-pointless delegation methods
Fill in some java docs