Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop

# Conflicts:
#	main/ui/src/main/resources/i18n/strings.properties