Merge branch 'develop' into setup_buttons

diff --cc res/layout-land/account_setup.xml
Simple merge

diff --cc res/layout/account_setup.xml
Simple merge

diff --cc res/values/setup.xml
index 2092c3f,31df6da..a2fb403
--- 1/res/values/setup.xml
--- 2/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -9,10 -9,10 +9,11 @@@
      <string name ="data_folder">owncloud</string>
      <string name ="log_name">Owncloud_</string>
      
-     <!-- Server URL -->
+     <!-- URLs and flags related -->
      <string name="server_url"></string>
      <bool name="show_server_url_input">true</bool>
 -      <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
 +    <bool name="show_welcome_link">true</bool>
++      <string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
      
      <!-- Flags to setup the authentication methods available in the app -->
      <string name="auth_method_oauth2">off</string>

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index f6c21e2,53f18bb..8f7fc2c
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1402,7 -1397,7 +1402,7 @@@ implements  OnRemoteOperationListener, 
       * @param view      'Account register' button\r
       */\r
      public void onRegisterClick(View view) {\r
--        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
++        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));\r
          setResult(RESULT_CANCELED);\r
          startActivity(register);\r
      }\r