Merge pull request #1892 from dennishendriksen/master

QueryGenerator unit tests + small bug fixes
Fix test
Merge pull request #1894 from jjettenn/master

Fix test
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