fix forgotten spelling.
Merge remote-tracking branch 'upstream/development' into fix_typo
XEP-0172
Merge remote-tracking branch 'upstream/development' into fix_typo
fix: warning: string 'publish_avatar' has no default translation.
also altered the types of resources from array to string-array in some res-files.
experimental message merging
require encrypted to be the same for messages to get merged
Merge pull request #398 from betheg/fix_res

fix: warning: string 'publish_avatar' has no default translation.
Merge pull request #391 from betheg/fix_typo

fix forgotten spelling.
some code cleanup
Smarter nickname highlight insert in confernces
Merge pull request #400 from xsrc/development

Smarter nickname highlight insert in confernces
add missing blank before nick
improvements for merge conditions
show merged time and status in message adapter
Update Dutch translations.
Merge pull request #401 from jelmer/dutch-updates

Update Dutch translations.
deleted unnecessary log
Contact presenceName property
updated readme