Merge branch 'release/0.2.24'
Merge branch 'release/0.2.25'
Hotfix: Remove leftover code from testing
Finished hotfix 0.2.25.1.
Hotfix: temporary disable unread badge
Merge branch 'hotfix/0.2.25.2' into develop
Fixup, unneeded console log in list.js
LILY-479: Update year of copyright text
LILY-490: Show account name in email message if available
Merge branch 'feature/LILY-490-show-provided-name-not-email' into develop
LILY-492: Clean up sender of email
Merge branch 'feature/LILY-492-cleanup-sender-in-email-list' into develop
LILY-486: Stop empty subject in template overwriting subject in compose
Merge branch 'feature/LILY-486-fix-empty-subject-template-overwrite' into develop
Separate users from contacts and accounts