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 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.
Merge pull request #855 from Gooru/dev-branch

Bugs fixes