Merge branch 'develop' into release-1.6.0

diff --combined res/values/strings.xml
index d80a79b,4c7cf34..03b5362
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -283,11 -283,11 +283,11 @@@
  
        <string name="prefs_category_accounts">Accounts</string>
        <string name="prefs_add_account">Add account</string>
 -      <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 +      <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  
        <string name="actionbar_logger">Logs</string>
        <string name="log_send_history_button">Send History</string>
-       <string name="log_mail_subject">Owncloud Android app logs</string>
+       <string name="log_mail_subject">ownCloud Android app logs</string>
        <string name="log_progress_dialog_text">Loading data...</string>
  
        <string name="saml_authentication_required_text">Authentication required</string>