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

Debugging google drive integration.
Sausd pagination limit removed
Merge pull request #847 from chandrasekharv/dev-branch

Sausd pagination limit removed
default child item count updated from 14 to 15 (optimization)
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Reverted code changes on console logs.
Merge pull request #848 from chandrasekharv/dev-branch

default child item count updated from 14 to 15 (optimization)
Handled if access token is valid or not.
Added option to disconnect from drive in setting page.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  default child item count updated from 14 to 15 (optimization)
  Sausd pagination limit removed
Merge pull request #849 from anilgooru/dev-branch

Google Drive fixes.
1. deprecated update file share option API.
2. Filter added to retrive not trashed files.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #850 from shivalinga/dev-branch

Google drive updates
Swf files has been handled in player.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #852 from shivalinga/dev-branch

Swf files has been handled in player.
null pointer exception has been handled.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch