Merge branch 'master' of https://github.com/owncloud/android into material_buttons

fixed realignment item badges
Conflicts:
	res/layout/list_item.xml

owncloud-android-library

@@ -1 +1 @@
-Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
+Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310

res/layout/list_item.xml

@@ -32,7 +32,7 @@
         <FrameLayout
             android:layout_width="60dp"
             android:layout_height="72dp"
-            android:paddingLeft="@dimen/standard_padding"
+            android:paddingLeft="12dp"
             android:paddingBottom="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_padding"
             android:paddingRight="4dp"
@@ -44,7 +44,7 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="top|right"
-                android:layout_marginLeft="21dp"
+                android:layout_marginRight="4dp"
                 android:src="@drawable/local_file_indicator" />
 
             <ImageView
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:layout_marginRight="2dp"
+                android:layout_marginRight="4dp"
                 android:src="@drawable/ic_favorite" />
         </FrameLayout>