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

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java

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

diff --cc res/values-cs-rCZ/strings.xml
Simple merge

diff --cc res/values-fi-rFI/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pt-rBR/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 40372e3,e9e9614..836eccc
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -202,10 -193,10 +202,10 @@@ public class FileListListAdapter extend
  \r
              switch (viewType){\r
                  case LIST_ITEM:\r
-                     TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
+                     TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);\r
                      TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);\r
-                     TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
+                     TextView lastModV = (TextView) view.findViewById(R.id.file_mod);\r
 -                    ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
 +\r
  \r
                      lastModV.setVisibility(View.VISIBLE);\r
                      lastModV.setText(showRelativeTimestamp(file));\r

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