Merge branch 'develop' into cancel_transfer_for_deleted_users

Conflicts:
	AndroidManifest.xml

diff --cc AndroidManifest.xml
index b520d09,780875b..f0d1e9d
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -3,7 -3,7 +3,7 @@@
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
--  Copyright (C) 2012-2014 ownCloud Inc.
++  Copyright (C) 2012-2015 ownCloud Inc.
  
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -86,7 -86,7 +86,6 @@@
              android:name=".ui.activity.Preferences"
              android:theme="@style/Theme.ownCloud" >
          </activity>
-         
 -
          <activity     
              android:name=".ui.preview.PreviewImageActivity" 
              />

diff --cc src/com/owncloud/android/files/services/FileDownloader.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
index 3ce1aac,6f77a9c..ef8bda4
--- 1/src/com/owncloud/android/files/services/FileUploader.java
--- 2/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -172,8 -171,23 +172,23 @@@ public class FileUploader extends Servi
      }
  
      /**
+      * Service clean up
+      */
+     @Override
+     public void onDestroy() {
+         Log_OC.v(TAG, "Destroying service" );
+         mBinder = null;
+         mServiceHandler = null;
+         mServiceLooper.quit();
+         mServiceLooper = null;
+         mNotificationManager = null;
+         super.onDestroy();
+     }
+ 
+ 
+     /**
       * Entry point to add one or several files to the queue of uploads.
 -     * 
 +     *
       * New uploads are added calling to startService(), resulting in a call to
       * this method. This ensures the service will keep on working although the
       * caller activity goes away.

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge