Update spanish translations
Update spanish translations
Update german translations
Merge pull request #694 from beriain/development

Update basque translation
Merge pull request #692 from kriztan/patch-3

Update german translations
Merge pull request #691 from kruks23/development

Update spanish translation
some saftey checks before registering listeners in XmppActivity
sent read marker to full jid
Remove broken / unused imports
Merge pull request #696 from SamWhited/development

Remove broken / unused imports
brought ad hoc conferences back. fixed #688 fixed #367
Merge branch 'development' of https://github.com/siacs/Conversations into development
import fixes
fixed potential NPEs
Update german translations
change status codes string 'number' to a better readable constant.
Merge pull request #699 from betheg/status_code

change status codes string 'number' to a better readable constant.
Merge pull request #698 from kriztan/patch-1

Update german translations
create file and dirs before creating file
changed listener timing and cache clearing after muc presences