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)