Merge remote-tracking branch 'upstream/develop' into

bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java

diff --cc project.properties
index c9e5840,28edd99..3c67d77
--- 1/project.properties
--- 2/project.properties
+++ b/project.properties
@@@ -10,3 -10,4 +10,5 @@@
  # Project target.
  target=android-19
  android.library.reference.1=actionbarsherlock/library
+ android.library.reference.2=owncloud-android-library
++android.library.reference.3=../android-library/android-library

diff --cc src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 9eb7d1d,a9b6ad2..c9408b1
--- 1/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@@ -18,12 -18,7 +18,8 @@@
  package com.owncloud.android.ui.fragment;
  
  import java.io.File;
 +import java.util.ArrayList;
  
- import com.owncloud.android.Log_OC;
- import com.owncloud.android.R;
- import com.owncloud.android.ui.adapter.LocalFileListAdapter;
- 
  import android.app.Activity;
  import android.os.Bundle;
  import android.os.Environment;