Merge pull request #7867 from gtorodelvalle/dialer-bug-835329-localization-not-loading-in-attention-screen

Bug 835329 - [DIALER] Timer is not appearing during an outgoing call (r=@etiennesegonzac)
Bug 836377: Optimize size of dialer app's PNG files

The optimized PNG files have been stripped from their metadata and
reencoded with minimal bit depth by running

  optipng --strip -o7 *.png

The optimized PNG files are around 30-50% of the size of the original
one's.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Merge remote-tracking branch 'upstream/master'
Merge pull request #7970 from tdz/bug-836377

Bug 836377: Optimize size of dialer app's PNG files
Merge pull request #7951 from KevinGrandon/bug_835507_lazy_email

Bug 835507 - lazy load email resources
Merge remote-tracking branch 'upstream/master'
Merge pull request #7933 from asutherland/email-pending-toaster-fix

Bug 837357 - [email/UI] Pending/deferred banner/toaster notifications for message deletion and moves are not displayed on transition back to message list from message reader. r=steveck-chung
bug 824575 - Add warning dialog when upadting via 3G network
Merge pull request #7817 from crh0716/3g_update

bug 824575 - Add warning dialog when updating via 3G network, r=timdream
Bug 835621: Cache the statusbar height to avoid forcing synchronous reflows. r=timdream
Bug 824542 - [Open_][SMS]No character count shows when editing a message.
Merge pull request #7954 from ian-liu/bluetooth/Bug837583_enabling/disabling_Bluetooth_log

Bug 837583 - Need a switch in Settings app for enabling/disabling Bluetooth log r=evelyn
Merge pull request #7931 from alivedise/bugzilla/837210/remove-code-preview

Bug 837210 - Remove code preview trigger, r=vivien
Bug 834191 - Captive portal w/ quick settings
Merge pull request #7976 from alivedise/bugzilla/834191_master

Bug 834191 - Captive portal w/ quick settings, r=timdream
Bug 838507 - Treat attributes in dataset as string
Bug 837277 - Incorrect birthday on contact page from imported facebook contact
Bug 822345 - Replace the network activity and system downloads animated GIFs with canvas elements animated via a timer callback
Merge pull request #7981 from gabrielesvelto/bug-822345

Bug 822345 - Replace the network activity and system downloads animated GIFs with canvas elements animated via a timer callback
Bug 837581 - Added travis.sh for travis integration, r=vivien