Merge branch 'share_link__new_share' into setup_additions

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ed3e121,a56fe3d..d4bba4e
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -103,8 -98,8 +98,8 @@@ import com.owncloud.android.utils.Log_O
   * @author David A. Velasco
   */
  
 -public class FileDisplayActivity extends FileActivity implements
 +public class FileDisplayActivity extends HookActivity implements
- OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener {
+ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, EditNameDialogListener {
  
      private ArrayAdapter<String> mDirectories;