Merge pull request #8311 from alivedise/bugzilla/842862_v1-train/l10n-emergency-call

Bug 842862 - Emergency call l10n, r=timdream+l10n, a=blocking-b2g:tef+
Bug 844168 - Don't rely locationchange event to show popup
Merge pull request #8314 from alivedise/bugzilla/844168_v1-train/delayed-window-open

Bug 844168 - Don't rely locationchange event to show popup, r=timdream, a=blocking-b2g:tef+
Merge pull request #8296 from crdlc/bug-842218-v2

Bug 842218 - Homescreen: lag when panning right to app list(cherry picked from commit 07b2f27bb7a94035bcc33e1c2a99ce7b61c4e6aa)
Merge pull request #8301 from crdlc/bug-827130

Bug 827130 - Feels like cannot pan page if gesture starts as blocked ove...(cherry picked from commit c62a8f8ec27981334c817485cb65362957ec5df2)
Merge pull request #8167 from etiennesegonzac/settings-fix-panel-with-range

Bug 840322 followup - fixing panel with input type=range(cherry picked from commit 3180227ca8cd498dd6558d808320377c1f5c8c5e)
Bug 843660: Load settings values for subpanels too. r=etienne
(cherry picked from commit 0cacf1a7e57baaf5d6698c98a4dd8c7041d8d4ae)
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(cherry picked from commit a3f3adc7456d72598ebd1fd32d8b91a1eddd2579)
Merge pull request #8163 from crdlc/bug-841082

Bug 841082 - [Contacts] The "sort by last name" switcher is not initiali...(cherry picked from commit fddf445e09d92a8acc5c445e4e189bfe87fe0cb6)
Merge pull request #8143 from jlebar/process-priority-fixes

Bug 836654 - Process priority fixes(cherry picked from commit dac3c41ee37d787a9483f41ea5c40a266f09ad59)
Merge pull request #8246 from jugglinmike/fix-sms-mock

Bug 843780 - Fix SMS mockup for desktop testing(cherry picked from commit 48e5aa9efc29636d2d521b090cdf1518a6050f3b)
Merge pull request #8285 from davidflanagan/bug833300

Bug 833300 - make input field clear buttons work in email app r=asuth(cherry picked from commit ac50d89ea2ece880337b4e085d80e570359086e0)
Merge pull request #8283 from EverythingMe/apps-to-canvas

[Bug 844565] change apps to use canvas instead of HTML elements [r=crdlc](cherry picked from commit b1911fb712f5e0cc833c612d29d622883870f58b)
Merge pull request #8319 from jmcanterafonseca/fix_link

[Bug 841716] [CONTACTS][FACEBOOK] Link contact to a facebook contact is ...(cherry picked from commit cb8953c8a686816f85f60144b991e7245d219bb2)
Bug 843204 - Add UA overrides requested by Everything.me
(cherry picked from commit e4fb12ad7a5162327162c9592677f1fb0a327b51)
Merge pull request #8063 from etiennesegonzac/dialer-lazy-telephony-connection

Bug 840538 - Make sure nothing causes the RIL to get instanciated in the dialer critical path.(cherry picked from commit 4cfe0507e51e962ee6911c477c589e47ffdd6506)
Merge pull request #7985 from gtorodelvalle/dialer-bug-835750-validate-numbers-passed-to-RIL

Bug 835750 - Validate the numbers that are passed to the RIL to dial.(cherry picked from commit 0511964bbbd3fbec9810bf8477f50607cf3776a7)
Bug 843776 - [sms] JavaScript errors when running application (sms.js) r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 845229 - added custom settings support

Conflicts:
	Makefile
Merge pull request #8346 from yurenju/settings.py-v1-train

Bug 845229 - added custom settings support