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.