Merge remote-tracking branch 'origin/bitfireAT/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/at/bitfire/davdroid/DavService.kt
#	app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt
#	app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/BaseDavSyncManager.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt
#	app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
#	app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt
#	app/src/main/java/at/bitfire/davdroid/ui/DefaultAccountsDrawerHandler.kt
#	app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
#	app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
#	app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt
#	app/src/main/java/at/bitfire/davdroid/ui/setup/LoginInfo.kt
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
#	app/src/main/res/values-ca/strings.xml
#	app/src/main/res/values-cs/strings.xml
#	app/src/main/res/values-da/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-hu/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-nb-rNO/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values-pl/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-uk/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/strings.xml
#	build.gradle
#	cert4android
#	dav4android
#	gradle/wrapper/gradle-wrapper.properties
#	ical4android
#	vcard4android