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
Folder Meta data erro message UI issue fixed
JSON stringify issue fixed for Teachers Tips saving
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #108 from chandrasekharv/release-6.2

Folder Meta data erro message UI issue fixed
Fixed encode issue for url textbox
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2
Merge pull request #109 from anilgooru/release-6.2

Fixed issue character limit issue.
Merge pull request #110 from nutan-gooru/release-6.2

Fixed encode issue for url textbox
"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
Setting previous data when click on cancel button
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

* upstream/release-6.2:
  "confilit resolved"
  "Edit new resource done"
  Fixed encode issue for url textbox
  JSON stringify issue fixed for Teachers Tips saving
  Folder Meta data erro message UI issue fixed

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/CollectionShareTabVc.java