Merge branch 'develop' into contact_settings

Conflicts:
	res/values/strings.xml

diff --cc res/values/strings.xml
index 0af01cd,0872084..c458fb2
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -48,14 -47,9 +48,16 @@@
      <string name="prefs_log_title_history">Logging History</string>
      <string name="prefs_log_summary_history">This shows the recorded logs</string>
      <string name="prefs_log_delete_history_button">Delete History</string>
 +    <string name="prefs_help">Help</string>
 +    <string name="prefs_recommend">Recommend to a friend</string>
 +    <string name="prefs_feedback">Feedback</string>
 +    <string name="prefs_imprint">Imprint</string>
      
 +      <string name="recommend_subject">"Try %1$s on your smartphone!"</string>
 +      <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>  
 +
+     <string name="auth_check_server">Check Server</string>
+     <string name="auth_account_name">Account name</string>
      <string name="auth_host_url">Server address</string>
      <string name="auth_username">Username</string>
      <string name="auth_password">Password</string>