fix forgotten spelling.
Merge remote-tracking branch 'upstream/development' into fix_typo
added basic csi
send inactive or active on every connect and resume
proper namespaces for xep-0352
basic message acking
properly set stanza count on session resume
reset unsend messages to waiting
Merge branch 'sm' into development

Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
version bump to 0.7-alpha
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