Merge bda4d84fa293381f6e6e6343204b1047145b67ac into b18f6b394c09bda47576f681719c47c517cc5b74

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 563 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 525 warnings</span>

src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -312,7 +312,7 @@ public class UserInfoActivity extends FileActivity {
         DisplayUtils.setAvatar(account, UserInfoActivity.this,
                 mCurrentAccountAvatarRadiusDimension, getResources(), getStorageManager(), avatar);
 
-        int tint = Color.parseColor(getStorageManager().getCapability(account.name).getServerColor());
+        int tint = ThemeUtils.primaryColor(account);
 
         if (userInfo != null) {
             if (!TextUtils.isEmpty(userInfo.getDisplayName())) {