Bug 960114 - Multiple CSS warnings shown when launching the Gallery app
Bug 831890 - [B2G][GALLERY] Crop Handles (Markers) disappear after changing orientations.
Bug 956174: copy the settings panel from system keyboard
Bug 948580 - [B2G][Email] Send "MAIL FROM" in SMTP probe to validate e-mail address.
GELAM changes included here.
Bug 968122 - Add default styles for homescreen dialogs
Bug 968110 -[costcontrol] Javascript error when open a notification when the application is closed
Bug 968852 - Alarm check sign overlays the notification.
Bug 968069 - Make header (month date) localizable in thumbnail view
Bug 970340 - [Download Manager]A file with a size >1GB is not displayed successfully
Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
(cherry picked from commit 4b5eaa4a2823d8961b80a3b975b1eeed92b9fcb7)

Conflicts:

	apps/gallery/js/MetadataParser.js
	apps/gallery/js/gallery.js
Bug 970320 -[Cost Control] Add configuration to provide top-up & check balance in Movistar Uruguay
Bug 970996 - Device serial would be initialized under get_device_manager. r=
Bug 952797 - Reactivation the dialer keypad integrations tests.
(the marionette issue was fixed by bug 891882)
Bug 970255 - escape $ signs in l10n arguments
GELAM changes for RCPT TO
Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date instead of first number displayed.
Bug 952912 - Check for update is on even for NOFTU builds.
Bug 897873 - [Buri][WIFI][language]Secrecy information of AP are not translated automatic
Bug 971507 - Sync the changes in js-test-agent and gaia