Fix: read methods are set to @RunAsSystem and update/set methods are not
@RunAsSystem
Merge branch 'master' of github.com:molgenis/molgenis
Html escape
Fix csv download
Merge pull request #1902 from dennishendriksen/master

Data explorer layout fixes
Merge pull request #1904 from fdlk/feature/1900

Set min-height, not max-height for filter wizard to prevent large filter...
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of github.com:erwinwinder/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/virtualRepository

Conflicts:
	molgenis-app-omx/pom.xml
	molgenis-app-omx/src/main/java/org/molgenis/gaf/GafListFileImporterService.java
	molgenis-core-ui/src/main/resources/templates/molgenis-input-elements.ftl
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/ElasticsearchEntity.java
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/ElasticsearchRepository.java
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/index/MappingsBuilder.java
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/response/ResponseParser.java
	molgenis-data-elasticsearch/src/test/java/org/molgenis/data/elasticsearch/ElasticsearchRepositoryDecoratorTest.java
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer-filter.js
	molgenis-omx-importer/pom.xml
	molgenis-search-elasticsearch/src/test/java/org/molgenis/elasticsearch/ElasticSearchServiceIntegrationTest.java

	+ refactoring // TODO testen fixen
fix merge
Merge pull request #1906 from erwinwinder/master

Fix csv download
Merge branch 'master' of github.com:molgenis/molgenis
Fixed placement of distinct drop down in aggregates view
Fixed int/long/decimal search filter
Merge pull request #1908 from jjettenn/master

Fix the problem with giving permissions to RuntimeProperty entity class
Merge branch 'master' of https://github.com/molgenis/molgenis
fix merge
Put form-group in form-horizontal
Merge pull request #1910 from erwinwinder/master

Fixed int/long/decimal search filter
formatting