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

Conflicts:
	res/layout/uploader_layout.xml

diff --cc res/layout/uploader_layout.xml
index d0f9c6e,79b077d..9be90b8
--- 1/res/layout/uploader_layout.xml
--- 2/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@@ -53,8 -53,8 +53,13 @@@
            android:orientation="horizontal" >
  
                <android.support.v7.widget.AppCompatButton
++<<<<<<< HEAD
 +                  android:id="@+id/uploader_new_folder"
 +                      android:theme="@style/Button"
++=======
+                   android:id="@+id/uploader_cancel"
+                       style="@style/ownCloud.Button"
++>>>>>>> f787213cd1cae854c169d263d3636e1de4dffa94
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"

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

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

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge