Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2
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
GWT event and handler created for update the folder meta data
Merge pull request #53 from chandrasekharv/release-6.2

Folder Meta data display on page reload in a folder open state
Folder Meta data reverse event added to update the DO object of FolderDo in Shelf List View.
Merge pull request #54 from chandrasekharv/release-6.2

Folder Meta data reverse event added to update the DO object of FolderDo in Shelf List View.
User should be able to see new fields for collections in the player

User should be able to see new fields for collections in the player and
Resource count has mismatch in play collection page
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2
"Adding new meta data fields to new resources and questions"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/AddQuestionResourceView.java
Merge pull request #55 from nutan-gooru/release-6.2

Fixed Resource count has mismatch in play collection page and implemented user should be able to see new fields for collections in the player
Merge pull request #56 from suryanarayanakb/release-6.2

Adding new meta data fields to new resources and questions
"Add Log in with Google button to "Customize" pop-ups"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2