remove logging
fix description, remove logging
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/resources/js/protocolviewer.js
add Chao's changes
add Chao's changes
Merge pull request #391 from dennishendriksen/master

Fix description in protocol viewer
replaced catch with else after if statement
convert restApi uri to entity id in order to retrieve entities from controller