[tx-robot] updated from transifex
[tx-robot] updated from transifex
Fixed cookie policy
Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on
OC-1055: Remove follow instruction.
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
	src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java