Bug 840069 [Messaging:MMS] Update compose input to div[contentEditable] for media display, create ThreadUI.compose object to handle placeholder, events, etc
Bug 840069 [Messaging:MMS] Add unit tests for placeholder, expose dom elements more cleanly, and add more interface methods
Bug 840069 [Messaging:MMS] Add Attachment constructor to hold data and render display element. Manage attachments in ThreadUI.compose, retreive message content as an array of text and attachments, and exposeinterface to attach. Unit tests included.
Bug 840069 [Messaging:MMS] Change append/attach to three methods (`insert`, `append` and `prepend`) that can take html, a dom node, or an attachment and insert it at the beginning, end, or at the current caret. Update and improve test coverage.
Merge branch '840069_message_preview' of https://github.com/danheberden/gaia
Bug 840069 - [MMS][User Story] Message preview including size
Bug 861846 - Landscape orientation locked apps render portrait in the task manager, which breaks the view of the app
Bug 863647 - [Task switcher] Sometimes tap events are fired during fast scroll
[dialer] Bug 860660 - PIN&PUK: Show counter of trials remain
Bug 864864 - fix again update manager unreliable tests r=etienne
Bug 862752 - Extend pretty date helper
Bug 811083 - Add preset option for client-side username validation
Bug 796588 - Don't allow user to setup same account twice r=lightsofapollo
Bug 858463 - Hide the subtitle 'Accounts' if there is no account in settings
Fix advanced settings view test
Add missing semicolon to end of line in advanced settings view
Bug 865175 - Fix communications import tests
Bug 857687 - Add L10N id for cancel button r=etienne
Bug 865068 - safeguard l10n date library from loading
Merge branch 'master' into 840069