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

Conflicts:
	res/layout/list_item.xml

diff --cc res/layout/list_item.xml
index 71efa7d,076ed7b..cf09502
--- 1/res/layout/list_item.xml
--- 2/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,8 -78,8 +81,8 @@@
                  android:ellipsize="middle"\r
                  android:singleLine="true"\r
                  android:text="TextView"\r
-                 android:textColor="#303030"\r
+                 android:textColor="@color/textColor"\r
 -                android:textSize="16dip" />\r
 +                android:textSize="@dimen/two_line_primary_text_size" />\r
  \r
              <LinearLayout\r
                  android:layout_width="match_parent"\r

diff --cc res/layout/ssl_untrusted_cert_layout.xml
Simple merge

diff --cc res/values/styles.xml
Simple merge

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

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