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

diff --cc res/layout/drawer_list_item.xml
index 8e6e238,8c10610..25415ac
--- 1/res/layout/drawer_list_item.xml
--- 2/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@@ -41,10 -41,10 +41,10 @@@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:paddingLeft="22dp"
 -        android:paddingRight="16dp"
 +        android:paddingRight="@dimen/standard_margin"
          android:textColor="@color/drawerMenuTextColor"
          android:text="@string/app_name"
-         android:textStyle="bold"
+         android:textStyle="normal"
          android:layout_gravity="center_vertical"
          android:textSize="14sp"
          />