fix forgotten spelling.
Fix some typos in the German translation.
Merge pull request #394 from suraia/translation-de

Fix some typos in the German translation.
fixed #389
more swedish translations
fixed npe
fixed link to old resource
Merge remote-tracking branch 'upstream/development' into fix_typo
brought npe catcher back for kxml parser
version bump to 0.6 with changelogs
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
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.