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

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

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1576a60,20bcdce..85711d7
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -492,9 -506,12 +501,10 @@@ public class FileDisplayActivity extend
          boolean retval = true;
          switch (item.getItemId()) {
              case R.id.action_create_dir: {
 -                CreateFolderDialogFragment dialog =
 -                        CreateFolderDialogFragment.newInstance(getCurrentDir());
 -                dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
 +                createFolder();
                  break;
              }
+ 
              case R.id.action_sync_account: {
                  startSynchronization();
                  break;