Merge branch 'neo4j2' of https://github.com/monowai/auditbucket into DAT-15-kompare-search

Conflicts:
	ab-engine/src/main/java/com/auditbucket/engine/endpoint/QueryEP.java
	ab-engine/src/main/java/com/auditbucket/engine/endpoint/SearchGateway.java
	ab-engine/src/main/java/com/auditbucket/engine/service/AbSearchGateway.java
	ab-engine/src/main/java/com/auditbucket/engine/service/MediationFacade.java
	ab-search/src/main/java/com/auditbucket/search/endpoint/ElasticSearchGateway.java
	ab-search/src/main/java/com/auditbucket/search/service/QueryService.java