clowder

Merge branch 'feature/ECGS-9-CSN-annotation' into to-merge-ECGS-9-CSN-annotation

Approach to merge "develop" and "ECGS-9-CSN-annotation" changes:
    start from the latest "develop" branch, create a branch
    "to-merge-ECGS-9-...", and merge.
Manually resolved the conflicts in routes, Datasets.scala and
searchUserMetadata.js.