Merge branch 'pr/400' into improve_notifications_pr_400_with_develop

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 4f1cd68,59e7754..a3394e6
--- 1/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
--- 2/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@@ -35,13 -36,11 +35,10 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.UpdateOCVersionOperation;
  import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
- import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.Log_OC;
  
- 
  import android.accounts.Account;
 -import android.accounts.AccountManager;
  import android.accounts.AccountsException;
- import android.app.Notification;
  import android.app.NotificationManager;
  import android.app.PendingIntent;
  import android.content.AbstractThreadedSyncAdapter;