Merge branch 'develop' into automationTest

diff --combined res/values/strings.xml
index c8c1ad7,0e2e945..5b19c75
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -78,7 -78,6 +78,7 @@@
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh file</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
 +    <string name="list_layout">List Layout</string>
      <string name="action_share_file">Share link</string>
      <string name="action_unshare_file">Unshare link</string>
      <string name="common_yes">Yes</string>
@@@ -335,5 -334,6 +335,6 @@@
  
      <string name="auth_refresh_button">Refresh connection</string>
      <string name="auth_host_address">Server address</string>
+     <string name="common_error_out_memory">Not enough memory</string>
  
  </resources>