Specify measurement for items in order, study manager fixes
Specify measurement with observation + bug fixes
Merge branch 'molgenis/1.2.2' of https://github.com/molgenis/molgenis into molgenis/1.2.2

Conflicts:
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/catalogmanager/OmxCatalog.java
Merge branch 'molgenis/1.2.2' of https://github.com/molgenis/molgenis into molgenis/1.2.2

Conflicts:
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/protocolviewer/ProtocolViewerServiceImpl.java
Update documentation
Merge pull request #2184 from dennishendriksen/molgenis/1.2.2

Study manager fixes