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

Conflicts:
	res/layout/list_item.xml

diff --git a/owncloud-android-library b/owncloud-android-library
index ecc3415..17bb724 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
+Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310