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
Remove unused DatabaseAction methods
Update entity report modal to bootstrap 3. Fixes #1835

Remove hide attribute.
Add modal-xxl class that shows at 90% width with auto overflow.
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-importer/src/main/resources/templates/UploadWizardPage.ftl
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 pull request #1837 from Mark-de-Haan/feature/bootstrap

More bootstrap css html fixes
Merge pull request #1836 from fdlk/master

Fix entity report modal.
Importer: rename, asynchronous, allow non admin users to import and add newly imported entities to menu
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo