Merge branch 'setAsWallpaper' into beta

diff --cc src/com/owncloud/android/files/FileMenuFilter.java
index 917f936,ca3b10b..e6638ba
--- 1/src/com/owncloud/android/files/FileMenuFilter.java
--- 2/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@@ -237,13 -227,13 +237,20 @@@ public class FileMenuFilter 
              toShow.add(R.id.action_unfavorite_file);
          }
  
 +        // STREAM
 +        if (mFile != null && !mFile.isDown() && (mFile.isAudio() || mFile.isVideo())){
 +            toShow.add(R.id.action_stream_file);
 +        } else {
 +            toHide.add(R.id.action_stream_file);
 +        }
 +
+         // SET PICTURE AS
+         if (mFile == null || !mFile.isImage()){
+             toHide.add(R.id.action_set_as_wallpaper);
+         } else {
+             toShow.add(R.id.action_set_as_wallpaper);
+         }
+ 
      }
  
  }