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

diff --cc .travis.yml
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/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/utils/DisplayUtils.java
Simple merge