update permission API has been implemented in google drive file API.
Merge pull request #840 from shivalinga/dev-branch

update permission API has been implemented in google drive file API.
SAUSD library "Professional Learning" subject updated.
Merge pull request #841 from chandrasekharv/dev-branch

SAUSD library "Professional Learning" subject updated.
Playing Google drive file in player functionality has
been implemented..
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #842 from shivalinga/dev-branch

Playing Google drive file in player functionality has been implemented.
showing error message when file deleted from the google drive
functionality has been implemented.
Merge pull request #843 from shivalinga/dev-branch

showing error message when file deleted from the google drive
Standards tab performance API changes implemented, API responses not available for testing on QA.
Merge pull request #845 from ssushma/dev-branch

Standards tab performance API changes implemented, API responses not ava...
Debugging google drive integration.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Standards tab performance API changes implemented, API responses not available for testing on QA.
  showing error message when file deleted from the google drive functionality has been implemented.
  Playing Google drive file in player functionality has been implemented..
  SAUSD library "Professional Learning" subject updated.

Conflicts:
	src/main/java/org/ednovo/gooru/server/service/ResourceServiceImpl.java