Merge pull request #831 from shivalinga/dev-branch

Listing google drive root files and child files has been implemented.
Added new error do object.
On logout removed cookies.
Integrated Google Drive Api and handled error validation.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Listing google drive root files and child files has been implemented.
  Fixed  [Player - Text] Under More Info Gooru Course is missing a ":" + space
  Fixed  https: Image file is not supported, 404 status showing in player
  "[I18N]compilation error resolved"
  Standard libray API has been reverted to old API.
  Removed text changes for flagging
  Hover state removed for 'Drag To Add'
  Text Changes

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/DrivePresenter.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/DriveView.java
	src/main/java/org/ednovo/gooru/server/service/ResourceServiceImpl.java
Merge pull request #832 from anilgooru/dev-branch

Added new error do object. On logout removed cookies. Integrated Google Drive Api and handled error validation.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/DrivePresenter.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/DriveView.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/DriveView.ui.xml
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/drive/driveStyle.css
	src/main/java/org/ednovo/gooru/server/service/WebService.java