Merge branch 'develop' into send_file_pr311_with_develop

diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
Simple merge

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

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
Simple merge