Merge branch 'development' of https://github.com/siacs/Conversations into development
Merge branch 'development' of https://github.com/siacs/Conversations into development
Merge branch 'development' of https://github.com/siacs/Conversations into development
Update Spanish Translations + harcoded just_now
Merge pull request #133 from kruks23/development

Update Spanish Translations + harcoded just_now