refactor QueryGenerator
commit changes to allow master pull
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo

Conflicts:
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/ElasticsearchRepositoryDecorator.java
	molgenis-data-elasticsearch/src/test/java/org/molgenis/data/elasticsearch/ElasticsearchRepositoryDecoratorTest.java
Elasticsearch repository decorator (wip)
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo

Conflicts:
	molgenis-search-elasticsearch/src/main/java/org/molgenis/elasticsearch/request/LuceneQueryStringBuilder.java
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Fixes for wizard
Initial commit molgenis-catalogue
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Indexing repo
Revert log levels
fix test (merge with master)
Merge pull request #1844 from dennishendriksen/feature/indexingrepo

Indexing Elasticsearch repository, distinct aggregates, bug fixes
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/molgenis-catalogue
Add tree to catalogue
Added entity header
Merge molgenis-search-elasticsearch and molgenis-search into molgenis-data-elasticsearch