Merge branch 'contact_settings' into setup_app_name

Conflicts:
	res/values/setup.xml

diff --cc res/values/setup.xml
index ecf3afe,75714e6..b5b9116
--- 1/res/values/setup.xml
--- 2/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -17,12 -7,16 +17,24 @@@
      <string name="auth_method_oauth2">off</string>
      <string name="auth_method_saml_web_sso">off</string>
      
 -</resources>
 +    <!-- Colors -->
 +    <color name="background_color">#F7F7F7</color>
 +    <color name="actionbar_start_color">#1D2D44</color>
 +    <color name="actionbar_end_color">#1D2D44</color>
 +    
 +    <!-- Multiaccount support -->
 +    <bool name="multiaccount_support">true</bool>
 +    
+     <!-- Help, imprint and feedback -->
+     <bool name="help_enabled">false</bool>
+     <bool name="imprint_enabled">false</bool> 
+     <bool name="recommend_enabled">false</bool>
+     <bool name="feedback_enabled">false</bool>
+     <string name="url_help">https://owncloud.com/mobile/help</string>
+     <string name="url_imprint"></string>
+     <string name="mail_recommend">"mailto:"</string>
+     <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
+     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
+ 
 +</resources>
+ 

diff --cc res/values/strings.xml
Simple merge