Merge branch 'development' of https://github.com/siacs/Conversations into image-preview

Conflicts:
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values/arrays.xml
	res/values/strings.xml