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
cleaned up whitespaces
Fixed the icon for removing elements in the filter wizard
Set proper indenting for html tags
Set text area width so it can hold placeholder text
changed the deactivate/activate button in the catalog manager. It now looks like it can be pressed
Fixed the minus icon for the first element in data explorer wizard
Fixed placement of integer filter input fields by setting the width to auto
Attribute filter modals are now generated like the wizard modal for consistency and overview.
fix removing last filter from wizard
Merge pull request #1834 from bartcharbon/master

fix removing last filter from wizard
Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap