Merge branch 'develop' into accounts_view

Conflicts:
	res/values/strings.xml

diff --cc res/values/strings.xml
index c9927ec,79b1d2f..a8179bb
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -279,7 -282,6 +282,8 @@@
        <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
        <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
  
 +      <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 a non secure route.</string>
  
  </resources>