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
Merge pull request #124 from dennishendriksen/master

Specify measurement with observation + bug fixes