bug 846220 - back out 364f2074b7df0e9c1442a269d16a57331dacab0d
Bug 832082 - Stk proactive command to display text does not function properly after receiving set idle mode text, r=vingtetun
(cherry picked from commit cd217e574b202b2e8eb5e48498705e6cd750e457)
Merge pull request #8122 from jmcanterafonseca/bug_841699_fixed

Bug 841669 - Contact list stops loading at certain contact: TypeError: e...(cherry picked from commit c64ee7587c9682856ae653bce95c56aea2daa979)
Merge pull request #8109 from vingtetun/defer

Bug 841353 - 'defer' more scripts. r=etienne(cherry picked from commit 88568d9f69edf0fcb7c59613f961b8804f1eaa88)
Fix Bug 849876 as well.

Conflicts:
	apps/browser/index.html
Merge pull request #8177 from borjasalguero/restore_desktop_testing

Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo(cherry picked from commit 993ba10c3daf8cd507b67839b1b7349f9572d1d9)
Merge pull request #8587 from kanru/bug850112

Bug 850112 - Enable A-GPS prefs r=fabrice
Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DISTRIBUTION_DIR
Merge pull request #8607 from yurenju/bug-847830-v1.0.1

Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DISTRIBUTION...
Bug 842575 - correctly kill the application when pushing a new version r=julienw a=npotb

Correctly find the pid
(cherry picked from commit bff669dbccd14042930ac6ac99063e3d36ec0dfd)
Merge pull request #8615 from stasm/849226-polish-keyboard-layout

Bug 849226 - Polish should have its own keyboard layout. r=rudyl, a=shira+(cherry picked from commit bc81fa5f3fffc9f6c8b216d19bf717fa77f2d628)
Merge pull request #7951 from KevinGrandon/bug_835507_lazy_email

Bug 835507 - lazy load email resources(cherry picked from commit 886b27d9d77f7c3a6fd05631e45cd63e8bbe69e9)
(cherry picked from commit f6ecea2a9ebf9e946eda38928df8cb802209a26b)
Bug 849226 - Follow up to: Polish should have its own keyboard layout

Use Python 2.6-compatible syntax for string formatting so un-break the tbpl
builds.
(cherry picked from commit e72327872c67ead87a051992a2706856be065673)
Merge pull request #8066 from asutherland/email-land-imap-use-tcp-shim

Bug 814257 - [email] Move back-end into worker thread (speculative). groundwork, use node shims instead of mozTCPSocket. r=asuth, a=gal(cherry picked from commit 0f87a505a1b1972dff92de35a04ec618492f31c9)
(cherry picked from commit b0061bb19f9d752b0f83092816d98a311dc77575)
Merge pull request #8070 from asutherland/email-explode-backend

Bug 814273 - [email] Replace concatenated gaia-email-opt.js with the files that make it up (as a vendor code drop). r=asuth(cherry picked from commit 02056c64bc15f879d5bdb1b4d02aa4b89bc4a5e7)
(cherry picked from commit a049035ba491a21c5ec7a53bba04b3cf4f5fe53a)
Merge pull request #8088 from KevinGrandon/shared_lazy_loader

Bug 841251 - Implement a simple shared lazy loader.

Official r=viven, thanks to mozsquib, rwldrn, asuth, daleharvey for feedback.(cherry picked from commit ab1d2c275643769a1854c49bfe5a3db2aa972542)

Conflicts:
	apps/gallery/js/gallery.js
(cherry picked from commit 9d95495833bfefa5e536e16b087f4a92b5cc17ee)
Merge pull request #8296 from crdlc/bug-842218-v2

Bug 842218 - Homescreen: lag when panning right to app list(cherry picked from commit 07b2f27bb7a94035bcc33e1c2a99ce7b61c4e6aa)
(cherry picked from commit faa2cd3042ab0a6d2c6d73b64d7991fee811735f)

Conflicts:
	apps/homescreen/js/grid.js
Bug 846768 - Switching apps is broken when we close another app before r=timdream

Several problems:
- we were decrementing twice the currentDisplayedApp value when closing using a
  swipe
- remove the useless callback in alignCurrentCard. We were not calling it in all
  situations before, but now I just removed it because we don't need to align
  before launching the app
(cherry picked from commit 3fdf72a6eb58be77cc3c2ee106e0dc98549ce87a)
Bug 837111 - Minify js source. r=ochameau
(cherry picked from commit fba586f468f6ac035f5c3e61e25e43d8fea7896f)
Merge pull request #8514 from alivedise/bugzilla/848006_master/muted-alarm

Bug 848006 - Check alarm screen visility again, r=timdream(cherry picked from commit 0bee8fb8d6f7c321e5cc3d79b26e539ac9c4f04e)
Merge pull request #8503 from daleharvey/834620-camera-lazy

Bug 834620 - Lazy load camera resources until preview starts. r=vingetun(cherry picked from commit 1f7dbc2534914620ba05126e99eb47991de758e6)