Merge pull request #122 from dennishendriksen/master

Fix #118 Withdraw study definitions + Prevent duplicate protocol identifiers
Track issue #2973 As LifeLines datamanager I want to publish unavailable items in the catalogue
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines
Merge pull request #123 from erwinwinder/master

Track issue #2973 As LifeLines datamanager I want to publish unavailable items in the catalogue
Specify measurement with observation + bug fixes
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines

Conflicts:
	src/main/java/org/molgenis/lifelines/catalog/GenericLayerCatalogManagerService.java