Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

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

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 107bca1,9643c89..6485524
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -788,8 -766,9 +788,9 @@@ implements  OnRemoteOperationListener, 
          } catch (IllegalArgumentException e) {\r
              // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
          }\r
--        \r
-         if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
 -        //if (result.isTemporalRedirection() || result.isIdPRedirection()) {\r
 -        if (result.isIdPRedirection()) {\r
++        
++        //if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
++        if (result.isIdPRedirection()) {
              String url = result.getRedirectedLocation();\r
              String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
              \r