Merge pull request #853 from shivalinga/dev-branch

null pointer exception has been handled.
Fixed Disconnect issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  null pointer exception has been handled.
  Swf files has been handled in player.
  1. deprecated update file share option API. 2. Filter added to retrive not trashed files.
Merge pull request #854 from anilgooru/dev-branch

Fixed Disconnect issue.
Fixed. Issue with collection id change.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #856 from anilgooru/dev-branch

Fixed. Issue with collection id change.
updated removing cookies.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #858 from anilgooru/dev-branch

updated removing cookies.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch