merge fix

diff --cc src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index cec268b,294dbfa..1db5246
--- 1/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
--- 2/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -26,14 -28,10 +28,12 @@@ import android.content.ContentResolver
  import android.content.Context;\r
  import android.content.DialogInterface;\r
  import android.content.DialogInterface.OnClickListener;\r
- import android.content.BroadcastReceiver;\r
- import android.content.ContentResolver;\r
  import android.content.Intent;\r
  import android.content.IntentFilter;\r
 +import android.database.Cursor;\r
  import android.net.Uri;\r
  import android.os.Bundle;\r
 +import android.provider.MediaStore;\r
  import android.util.Log;\r
  import android.view.View;\r
  import android.view.ViewGroup;\r