Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -788,8 +788,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         } catch (IllegalArgumentException e) {
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens
         }
-        
-        if (result.isTemporalRedirection() && result.isIdPRedirection()) {
+        
+        //if (result.isTemporalRedirection() && result.isIdPRedirection()) {
+        if (result.isIdPRedirection()) {
             String url = result.getRedirectedLocation();
             String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);