save login nick for mucs during join
Merge branch 'master' into development
Update strings.xml
Merge pull request #299 from beriain/development

Update strings.xml
Merge branch 'development' of github.com:siacs/Conversations into development
refactored message adapter into seperate class
fixed #301
brought settings and manage account menu items back
switched to mtm
Update Spanish Translations
Merge pull request #303 from kruks23/development

Update Spanish Translations
some cleanup
Merge branch 'development' of github.com:siacs/Conversations into development
updated mtm
typos
Merge pull request #307 from Erkan-Yilmaz/development

typos
more disco. fixed chat markers with jappix
Merge branch 'development' of github.com:siacs/Conversations into development
fixed bug with otr session being initilized over and over again
answer correctly if both markers and receipts are requested