uml
Model tags
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-model-registry/src/main/resources/css/standardsregistry.css
	molgenis-model-registry/src/main/resources/js/standardsregistry.js
	molgenis-model-registry/src/main/resources/templates/view-standardsregistry.ftl
Fix uml
Package tags
Merge branch 'master' of https://github.com/molgenis/molgenis
Remove unused dependency
Fixed package update
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/erwinwinder/molgenis

Conflicts:
	molgenis-data-mysql/src/main/java/org/molgenis/data/importer/EmxImportService.java
Merge pull request #2075 from dennishendriksen/master

Tags (fixed)
Merge pull request #2077 from bartcharbon/master

fix: #2076 (DataExplorer ResourceBundle bug)
Merge pull request #2080 from bartcharbon/master

fix: Some imported VCF files report errors in data explorer #2073
Fix nullpointer
Fix high priority Findbugs issue
Merge pull request #2081 from erwinwinder/master

Fix nullpointer
Merge branch 'master' of https://github.com/dennishendriksen/molgenis
Merge pull request #2082 from dennishendriksen/master

Fix high priority Findbugs issue
'hidden' in plaats van 'visible' tonen bij attribute constraints