Merge branch 'develop' into pull_down_refresh

diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ae38805,4babd9d..ee7d324
--- 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
@@@ -181,11 -181,6 +181,6 @@@ FileFragment.ContainerActivity, OnNavig
          mRightFragmentContainer = findViewById(R.id.right_fragment_container);
          if (savedInstanceState == null) {
              createMinFragments();
-         } else {
-             Log_OC.d(TAG, "Init the secondFragment again");
-             if (mDualPane) {
-                 initFragmentsWithFile();                
-             }
          }
  
          // Action bar setup
@@@ -927,15 -922,6 +922,15 @@@
                          removeStickyBroadcast(intent);
                          Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
                          setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
 +                        
 +                        if (mSyncInProgress) {
 +                            getListOfFilesFragment().disableSwipe();
 +                            
 +                        } else {
 +                            getListOfFilesFragment().enableSwipe();
 +                            getListOfFilesFragment().hideSwipeProgress();
 +                        }
 +                        
                  }
                  
                  if (synchResult != null) {