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