Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
fix: correct pilots calculation
Merge branch 'master' of https://github.com/molgenis/molgenis
remove logging
fix description, remove logging
show no result message if no data items are matched with query
trimed the query before parsing to search API, otherwise it will throw an error in search api if there space before/after the query
Merge pull request #388 from ChaoPang/master

Show "no result message" if no data items are matched with query
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
Merge branch 'master' of https://github.com/molgenis/molgenis
replaced catch with else after if statement
convert restApi uri to entity id in order to retrieve entities from controller
fixed a small bug
cleaned up the code
Merge pull request #385 from georgebyelas/master

Small fix: correct pilots calculation
Merge pull request #392 from ChaoPang/master

Fixed the bugs for download and order