Fixes for problems with missing documents
Merge remote-tracking branch 'vpro/master' into vpromaster

Conflicts:
	degraphmalizer-core/src/main/java/dgm/modules/elasticsearch/QueryFunction.java