Merge branch 'develop' into modify_password

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

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 948c4d2,7428f50..1a1cd51
--- 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
@@@ -47,9 -47,8 +47,9 @@@ import com.actionbarsherlock.app.Sherlo
  import com.actionbarsherlock.view.Menu;
  import com.actionbarsherlock.view.MenuInflater;
  import com.actionbarsherlock.view.MenuItem;
- import com.owncloud.android.AccountUtils;
  import com.owncloud.android.authentication.AccountAuthenticator;
 +import com.owncloud.android.authentication.AuthenticatorActivity;
+ import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.Log_OC;
  
  import com.owncloud.android.R;