[Bug 838005] - SMS - Resolved Merge conflict with v1 traini, removed unneeded include file for this feature which is not in v1-train yet. - URL invocation from message r=borjasalguero
Bug 851238 - Add icon to event template
backout dc68fcf06253e8844f8803f7f5a144c46a274615
bug 851278 - exclude test stub apps from dogfood builds
(cherry picked from commit 73f407d356db424dd689543a6cacee5b36861a42)

bug 851278 followup - remove obsolete dir from external apps dirs
(cherry picked from commit fc6fa694cbe2ac792db1fb756824228c1b6682be)
Bug 832261 - Calendar scrolling issue. Author=leob2g
Merge pull request #7743 from majewan/bug796798

BUG 796798 - [settings] colorized bar chart missing from media storage s...(cherry picked from commit 3df466a3a11c898adc1874c59784ce83a3bab300)

Merge pull request #8293 from evelynhung/issue-842215

bug 842215 - some tweaks to improve performance(cherry picked from commit e8cb49b8782d93a197a927b48cd4c374268f7a37)

Conflicts:

	apps/settings/js/icc_menu.js
Merge pull request #8641 from gasolin/issue-838040

Bug 838040 - allow access of bookmark menu from the bookmark tab, r=bfrancis(cherry picked from commit 3ec87491b12bbc079fbd251846778b7ee9277986)
Merge pull request #8619 from etiennesegonzac/dialer-iframe-removal

Bug 849929 - Removing the contacts tab iframe from the critical launch path(cherry picked from commit 8333996b0bd0ac3f186d4b399aca074772299b31)
Merge pull request #8186 from jaoo/836257

Bug 836257 - Be aware of GECKO_CARDSTATE_UNKNOWN new card state in Gaia ...(cherry picked from commit c76e97d635f9a6205a9a3933a79e90e27b25f4c9)
Bug 852245 - Allow the number of runs of the perf test to be configurable r=julienw a=npotb

You can change them with this command:
RUNS=2 make test-perf
(cherry picked from commit 5ed7ec4108a06c8d52d0adfefb214183070d5e51)
Merge pull request #8563 from yurenju/bug-849737 a=npotb

Bug 849737 - downloaded firefox 64bit version instead of 32bit for travi..., r=alive(cherry picked from commit b398be093a4e2d62326023764d6eea1faf2acb49)
Bug 851124 - [E-Mail] uplift all email to v1-train

Also remove all deleted files
Merge pull request #8513 from crdlc/846218

Bug 846218 - [Homescreen] Dragging performance enhancement(cherry picked from commit ee236c942f2b9abe9065c2fb967b715770a43d9c)

Conflicts:
	apps/homescreen/js/page.js
Merge remote-tracking branch 'ssaroha/sms-v1-train' into v1-train

Bug 838005] [SMS][User Story] Browser invocation from message
Merge pull request #8082 from benfrancis/browser-processes

Bug 836647 Use less foreground processes during screenshotting and Web Activities(cherry picked from commit bae26c4a96b371b794b4433784410c1ec69c5093)
Bug 849280 - lazyloading of HTML, CSS & JS in the browser app r=benfrancis

shared files fix

lint fix

newline

linting errors

lint

lazy loader tests

lazy load shared css

first time thumbnail screen fix

leftovers

topsites screen fixed

web activities fix
(cherry picked from commit d7f7c66a3f296e32a095393cd767022819fc102f)
Merge pull request #8367 from davidflanagan/bug845539

Bug 845539: display correct error message for invalid phone numbers r=gtorodelvalle a=tef+(cherry picked from commit 50e404a41581ac2958b2a377a6e12ec5441b7580)
Merge pull request #8610 from rexboy7/fix-bug832182-2call-unit

Bug 832182: [Communication] Allow second phone call.(cherry picked from commit 1f392276f3976f8a10fa0d1df5b20837008b0144)
Merge pull request #8496 from gtorodelvalle/dialer-bug-838119-call-log-select-all-malfunction

Bug 838119 - [DIALER][CALL LOG] Select all option is not working fine if the device is locked while the user is in the edit mode (r=borjasalguero).(cherry picked from commit 038974f2724feebb99d0bff21885c097a0f2bd42)
Merge pull request #8571 from jmcanterafonseca/fte_importation

Bug 848821 - Refine FTU Hotmail & Gmail import for checking network conn...(cherry picked from commit 38eb11c1d34976bc645be4ea91e52c14139d1d33)