"resource format changes updated for add resource,edit resource, add file and edit file popups"
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/EditResourcePopupVc.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/EditResourcePopupVc.ui.xml
"Set Advanced options null check handled"
Merge pull request #2349 from sravanthi1/release-6.6.3.a1

"Resource format changes updated for add resource,edit resource, add file and edit file popups"
Search filters Grade prefix text updated and collection search spell checker implemented.
Merge pull request #2350 from ssushma/release-6.6.3.a1

Search filters Grade prefix text updated and collection search spell che...
"Thumbnail arrow images changes updated"
Merge pull request #2351 from sravanthi1/release-6.6.3.a1

"Thumbnail arrow images changes updated"
Merge branch 'release-6.6.3.a1' into Merged-Responsive-Ui

* release-6.6.3.a1:
  "Thumbnail arrow images changes updated"
  Search filters Grade prefix text updated and collection search spell checker implemented.
  "Set Advanced options null check handled"
  "resource format changes updated for add resource,edit resource, add file and edit file popups"

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/search/SearchFilterVc.java