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

Conflicts:
	res/values-eu/strings.xml
formating in strings file
fixed spelling thanks @betheg
Merge remote-tracking branch 'upstream/development' into add_request

Conflicts:
	res/layout/message_received.xml
	src/eu/siacs/conversations/ui/adapter/MessageAdapter.java