Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Change MysqlEntity setter so that it accepts entity values for xref and mref attributes.
Merge branch 'master' of https://github.com/molgenis/molgenis
uml
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/uml

Conflicts:
	molgenis-model-registry/src/main/resources/css/standardsregistry.css
uml enhancements
Lower log level
Update documentation
Merge pull request #2105 from fdlk/fix/1992

Fix #1992
Merge pull request #2106 from erwinwinder/feature/uml

Feature/uml
Fix #2053 use attributeParts for compound attributes
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #2108 from fdlk/feature/transactImport

Feature/transact import
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-data-mysql/src/main/java/org/molgenis/data/importer/EmxImportService.java
Fix tests, merge with master
Merge branch 'master' of https://github.com/dennishendriksen/molgenis into feature/transactImport
Add 30 second timeout to the DDL execution for the rare case of deadlocks.
Convert shared Compound entities to XREFs with IDs.

- DICOM