Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #124 from ssushma/release-6.2

Scrollbars enabled on closing the join class popup.
"changed standards accroding to API change"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #126 from suryanarayanakb/release-6.2

changed standards accroding to API change
Changes for resource edit metadata and on resource and preview player displaying metadata fields implemented.