"Static data updated for new metadata fields in preview player."
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
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
Merge pull request #112 from anilgooru/release-6.2

Setting previous data when click on cancel button
Navigation confirmation popup text
has been changed.
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.1.5
fixed user request: Cannot add Zyante Resources
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2
Merge pull request #113 from shivalinga/master

Navigation Confirmation popup
Merge pull request #114 from nutan-gooru/release-6.2

fixed user request: Cannot add Zyante Resources
Character limit implemented for the folder meta data text areas
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #116 from chandrasekharv/release-6.2

Character limit implemented for the folder meta data text areas
"new metadata fields updated in preview player."
Navigation confirmation popup:
Now confirmation popup has been implemented when user clicks
on navigation resource.
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.1.5
Merge pull request #118 from shivalinga/master

Navigation confirmation popup:
fixed css issue for title