Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

diff --cc src/com/owncloud/android/media/MediaService.java
index 7bd9c0c,5b86526..d6fbfcc
--- 1/src/com/owncloud/android/media/MediaService.java
--- 2/src/com/owncloud/android/media/MediaService.java
+++ b/src/com/owncloud/android/media/MediaService.java
@@@ -39,7 -36,7 +39,8 @@@ import android.net.wifi.WifiManager
  import android.net.wifi.WifiManager.WifiLock;
  import android.os.IBinder;
  import android.os.PowerManager;
 +import android.support.v7.app.AlertDialog;
+ import android.support.v7.app.NotificationCompat;
  import android.widget.Toast;
  
  import java.io.IOException;