Merge branch 'master' of https://github.com/nextcloud/android into favourites

# Conflicts:
#	build.gradle

build.gradle

@@ -182,7 +182,7 @@ dependencies {
     compile 'com.google.code.findbugs:annotations:2.0.1'
     compile group: 'commons-io', name: 'commons-io', version: '2.4'
     compile 'com.google.android.gms:play-services:10.2.0'
-    compile 'com.github.evernote:android-job:v1.1.7'
+    compile 'com.github.evernote:android-job:v1.1.8'
     compile 'org.greenrobot:eventbus:3.0.0'
 
     compile 'org.parceler:parceler-api:1.1.6'

src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java

@@ -21,13 +21,13 @@
 
 package com.owncloud.android.files;
 
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.services.observer.FileObserverService;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.services.observer.FileObserverService;
+
 
 /**
  * App-registered receiver catching the broadcast intent reporting that the system was 

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -200,7 +200,7 @@ public class FileStorageUtils {
         if (com.owncloud.android.db.PreferenceManager.instantVideoUploadPathUseSubfolders(context)) {
             subPath = getSubpathFromDate(dateTaken);
         }
-        return uploadVideoPath + subPath + (fileName == null ? "" : fileName);
+        return uploadVideoPath + OCFile.PATH_SEPARATOR + subPath + (fileName == null ? "" : fileName);
     }
     
     public static String getParentPath(String remotePath) {