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