Restructure menu to avoid overflow on low resolutions
Bug fixes
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-core-ui/src/test/java/org/molgenis/ui/controller/StaticContentServiceImplTest.java
merge with master
Layout fix
Its broken and will be fixed when BioBankConnect will be fixed
Fix test. De default value of the size when undefined is 1000.
Merge pull request #1896 from jjettenn/master

Fix tests
Layout fixes
Merge branch 'master' of https://github.com/molgenis/molgenis
Aggregates for nillable attributes
Merge pull request #1901 from dennishendriksen/master

Aggregates for nillable attributes + layout fixes
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/aggregate-threshold

Conflicts:
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/response/ResponseParser.java
Fix merge