Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
"New MyCollections flow integrated for Include "Add" button option in toolbar for resources and collections in search"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/search/AddResourceContainerView.java
Merge pull request #1164 from sravanthi1/dev-branch

	"MyCollections flow integrated in Search"
Merge pull request #1165 from ssushma/dev-branch

Alignment issues on classpage resolved
Upload resource issues text and image issue resolved