Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java

diff --cc src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index f5d06dc,64effc4..1b73c86
--- 1/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
--- 2/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@@ -198,23 -197,51 +198,34 @@@ public class AccountSelectActivity exte
      private void populateAccountList() {
          AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
          Account accounts[] = am
 -                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
 -        if (am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length == 0) {
 +                .getAccountsByType(MainApp.getAccountType());
-         LinkedList<HashMap<String, String>> ll = new LinkedList<HashMap<String, String>>();
-         for (Account a : accounts) {
-             HashMap<String, String> h = new HashMap<String, String>();
-             h.put("NAME", a.name);
-             h.put("VER",
-                     "ownCloud version: "
-                             + am.getUserData(a,
-                                     AccountAuthenticator.KEY_OC_VERSION));
-             ll.add(h);
++        if (am.getAccountsByType(MainApp.getAccountType()).length == 0) {
+             // Show create account screen if there isn't any account
 -            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
++            am.addAccount(MainApp.getAccountType(), 
+                     null,
+                     null, 
+                     null, 
+                     this, 
+                     null,                        
+                     null);
          }
+         else {
+             LinkedList<HashMap<String, String>> ll = new LinkedList<HashMap<String, String>>();
+             for (Account a : accounts) {
+                 HashMap<String, String> h = new HashMap<String, String>();
+                 h.put("NAME", a.name);
+                 h.put("VER",
+                         "ownCloud version: "
+                                 + am.getUserData(a,
+                                         AccountAuthenticator.KEY_OC_VERSION));
+                 ll.add(h);
+             }
  
-         setListAdapter(new AccountCheckedSimpleAdepter(this, ll,
-                 android.R.layout.simple_list_item_single_choice,
-                 new String[] { "NAME" }, new int[] { android.R.id.text1 }));
-         registerForContextMenu(getListView());
-         
+             setListAdapter(new AccountCheckedSimpleAdepter(this, ll,
+                     android.R.layout.simple_list_item_single_choice,
+                     new String[] { "NAME" }, new int[] { android.R.id.text1 }));
+             registerForContextMenu(getListView());
+         }
      }
  
      @Override