Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts

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

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index d88b8dc,9569a53..ee38c4b
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -85,6 -84,8 +85,7 @@@ import com.owncloud.android.ui.dialog.I
  import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 -import com.owncloud.android.utils.Log_OC;\r
+ import com.owncloud.android.utils.DisplayUtils;\r
  \r
  /**\r
   * This Activity is used to add an ownCloud account to the App\r

diff --cc src/com/owncloud/android/ui/activity/Preferences.java
Simple merge