Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
"Edit new resource done"
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/CollectionShareTabVc.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/folders/FolderItemMetaDataUc.ui.xml
"confilit resolved"
Merge pull request #111 from suryanarayanakb/release-6.2

editing a new resources fields implemented