Merge pull request #669 from grecep/master

Add "select all" option to photo (or other) upload screen

diff --cc src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 0918572,9eb5143..83e7bc0
--- 1/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
--- 2/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@@ -34,9 -34,11 +34,12 @@@ import android.widget.TextView
  
  import com.actionbarsherlock.app.ActionBar;
  import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+ import com.actionbarsherlock.internal.view.menu.ActionMenuItemView;
+ import com.actionbarsherlock.view.Menu;
+ import com.actionbarsherlock.view.MenuInflater;
  import com.actionbarsherlock.view.MenuItem;
  import com.owncloud.android.R;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;

diff --cc src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
Simple merge