Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
	owncloud-android-library

diff --cc res/values-de-rDE/strings.xml
Simple merge

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

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

diff --cc src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index aef1de1,601ec4f..9b7050e
--- 1/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
--- 2/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@@ -22,10 -22,8 +22,11 @@@
  
  package com.owncloud.android.ui.activity;
  
 +import android.content.Intent;
 +import android.os.Bundle;
 +
  import com.owncloud.android.datamodel.OCFile;
+ import com.owncloud.android.files.services.FileDownloader;
  import com.owncloud.android.files.services.FileUploader;
  import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.dialog.ConflictsResolveDialog;

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

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

diff --cc src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
Simple merge