Conflicts: AndroidManifest.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java