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
Merge pull request #1163 from anilgooru/dev-branch

Fixed: Parallel [My Collections] Can not scroll at my collections tutorial page.
"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
Alignment issues on classpage resolved
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
"First time default MyCOllections not displayed resolved"
Upload resource issues text and image issue resolved
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1166 from ssushma/dev-branch

Upload resource issues text and image issue resolved
Merge pull request #1167 from sravanthi1/dev-branch

"First time default MyCOllections not displayed resolved"
"removed public to display all the collections from My Work Space"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
share and remix button updated in all places.
data log events mode has changed in play modes.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1168 from sravanthi1/dev-branch

"removed public to display all the collections from My Work Space"