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
Fixed window scroll issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Print statements for User file upload feature
  Classpage sort options issue resolved on Assignments tab click.
  "Making all popups in center."
  Added privacy messages for email.
  Reverted resource tag while creating new resource.
Merge pull request #1161 from nutan-gooru/dev-branch

Implemented California Social Science Standards and CA-ELD
Rectified search aggregator,standards container UI issues.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1162 from VinRudramurthy/dev-branch

Rectified search aggregator,standards container UI issues.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Rectified search aggregator,standards container UI issues.
  implemented  California Social Science Standards and CA-ELD
Fixed: Parallel [My Collections] Can not scroll at my collections tutorial page.
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