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 github.com:molgenis/molgenis
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 github.com:molgenis/molgenis
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
Expose for update;
Fix the last merge
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
refactor and merge code. Fix the the previous merge
Change type email field from text to email
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1841 from erwinwinder/master

Importer issues
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1843 from erwinwinder/master

Fix tests
Merge pull request #1842 from jjettenn/master

Fix previous merge! Refactor code.