Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...

Conflicts:
	res/layout/drawer.xml
	res/layout/drawer_list_item.xml
	res/values/styles.xml

diff --combined res/layout/drawer_list_item.xml
index 2ba2b0d,1f9cbb6..8e6e238
--- 1/res/layout/drawer_list_item.xml
--- 2/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@@ -24,15 -24,15 +24,15 @@@
      android:layout_alignParentLeft="true"
      android:orientation="horizontal"
      android:background="@color/background_color"
 -    android:layout_marginTop="16dp"
 -    android:layout_marginBottom="16dp"
 +    android:layout_marginTop="@dimen/standard_margin"
 +    android:layout_marginBottom="@dimen/standard_margin"
      android:minHeight="?android:attr/listPreferredItemHeight">
  
      <ImageView
          android:id="@+id/itemIcon"
          android:layout_width="24sp"
          android:layout_height="24sp"
 -        android:layout_marginLeft="16sp"
 +        android:layout_marginLeft="@dimen/standard_margin"
          android:layout_gravity="center_vertical"
          />
  
@@@ -41,7 -41,7 +41,7 @@@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:paddingLeft="22dp"
-         android:paddingRight="@dimen/standard_padding"
 -        android:paddingRight="16dp"
++        android:paddingRight="@dimen/standard_margin"
          android:textColor="@color/drawerMenuTextColor"
          android:text="@string/app_name"
          android:textStyle="bold"