Fixed conflict - Merge branch 'develop' into better_loggin_system

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
Simple merge

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge

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

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

diff --cc src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 45a6aaf,85b04b2..5d3f7ac
--- 1/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@@ -33,8 -33,9 +33,9 @@@ import android.widget.TextView
  
  import com.actionbarsherlock.app.SherlockFragment;
  import com.owncloud.android.R;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.ExtendedListView;
 -import com.owncloud.android.utils.Log_OC;
+ import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
  
  /**
   *  TODO extending SherlockListFragment instead of SherlockFragment 

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 099e442,4e76853..3665fe0
--- 1/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -34,9 -34,9 +34,10 @@@ import com.owncloud.android.R
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.FileMenuFilter;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
  import com.owncloud.android.ui.activity.MoveActivity;
+ import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
  import com.owncloud.android.ui.adapter.FileListListAdapter;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;