Merge branch 'master' into create_folder_button_on_action_bar_for_uploader

Conflicts:
	res/layout/uploader_layout.xml

diff --cc res/layout/uploader_layout.xml
index 6245c8b,2ba4a0b..79b077d
--- 1/res/layout/uploader_layout.xml
--- 2/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@@ -52,16 -52,18 +52,18 @@@
            android:layout_alignParentBottom="true"
            android:orientation="horizontal" >
  
-               <Button
+               <android.support.v7.widget.AppCompatButton
 -                  android:id="@+id/uploader_new_folder"
 +                  android:id="@+id/uploader_cancel"
+                       style="@style/ownCloud.Button"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
 -                  android:text="@string/uploader_btn_new_folder_text" />
 +                  android:text="@string/common_cancel" />
-               
-               <Button
+ 
+               <android.support.v7.widget.AppCompatButton
                    android:id="@+id/uploader_choose_folder"
+                       style="@style/ownCloud.Button"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"

diff --cc src/com/owncloud/android/ui/activity/Uploader.java
Simple merge