Error message changed.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  added tags ui in edit resource popup
  Changed logic of clickhandler for reviews in search page.
  new text for standards
  included California Social Science Standards and CA-ELD Standards in Standards Preference
  Added Mixpanel events for Customize/Assign popups.
  css changes for popups and upload text file changes - implemented
  Top Navigation bar position has been fixed.
Resolved google drive file add.
Merge pull request #1158 from anilgooru/dev-branch

Error message changed.