Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Integrated folder meta data update API
Merge pull request #48 from chandrasekharv/release-6.2

Integrated folder meta data update API
"New metadata fields updated in preview player"
Add Multiple answer support has been implemnented
Merge pull request #49 from shivalinga/master

Add Multiple answer support has been implemented
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Collection Metadata Info Edit implemented for Depth of Knowledge and Learning skills information, constituting the secondary information for the collection edit under organize tab.
Collection Metadata Info Edit implemented for Depth of Knowledge and Learning skills information, constituting the secondary information for the collection edit under organize tab.
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

Conflicts:
	src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
"New UI Integrated for additional metadata fields in preview player"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #50 from ssushma/release-6.2

Collection Metadata Secondary information Edit implemented
Merge pull request #51 from sravanthi1/release-6.2

New UI Design integrated for meta data fields in preview player
"Added mixpanel events for OER checkbox"
"Add Log in with Google button to "Assign"  pop-ups"
DO-4144 implemented for the meta data display
Merge pull request #52 from mitraj/release-6.2

"Added mixpanel events for OER checkbox"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2