Update strings.xml
Merge branch 'development' of https://github.com/beriain/Conversations into development

Conflicts:
	res/values-eu/strings.xml
formating in strings file