Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta

diff --cc res/values/strings.xml
Simple merge

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

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

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

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

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 5a40b29,7b082ea..79a4408
--- 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
@@@ -37,9 -34,8 +37,10 @@@ import android.view.View
  import android.widget.AdapterView;
  import android.widget.AdapterView.AdapterContextMenuInfo;
  import android.widget.PopupMenu;
 +import android.widget.TextView;
 +import android.widget.Toast;
  
+ import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.FileDataStorageManager;

diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
Simple merge