Bug 824575 - Add warning dialog when upadting via 3G network, r=timdream, a=tef+
Merge pull request #7974 from crh0716/v1.0.1_3g_update

Bug 824575 - Add warning dialog when upadting via 3G network, r=timdream, a=tef+
Bug 836609 - Add data roaming warning dialog
Merge pull request #7986 from crh0716/v1.0.1_836609

Bug 836609 - Add data roaming warning dialog, r=kaze, a=shira+
Bug 837590 - Change button into anchor
Bug 834122 - FTU captive portal
Merge pull request #7979 from alivedise/bugzilla/834122_v1-train/rebasing2

Bug 834122 - FTU captive portal, r=timdream, a=blocking-b2g:shira+
Bug 835795 - hide iframe if it's launched in bg
Merge pull request #8026 from alivedise/bugzilla/835795_v1-train/dont-set-visibility-to-false-init-app

Bug 835795 - hide iframe if it's launched in bg, r=timdream, a=blocking-b2g:tef+
Bug 837055 - enable word suggestion for Spanish keyboard layout. r=djf, a=blocking-b2g:tef+
(cherry picked from commit c0c1217639bd1adf469d4da0d05d43daca9d4c14)

Conflicts:
	apps/keyboard/js/layout.js
Merge pull request #8031 from RudyLu/commit_v1_train/Bug837055-word_Suggestion_for_Spanish

Bug 837055 - enable word suggestion for Spanish keyboard layout. r=djf, ...
Merge pull request #7686 from Rik/banding-jones-829075

Bug 829075 - Lock screen background show significant banding r=timdream a=tracking-b2g18+(cherry picked from commit 2dac54c4032cbd00698eb6f6a6c6408cfd16a8fb)
Bug 836293 - Lockscreen wallpaper is not updated after changing homescreen wallpaper r=timdream
(cherry picked from commit 7f655a193dcbcb475762d27db54f6cc8bab0ba74)
Merge pull request #7949 from Rik/lockscreen-camera-836300

Bug 836300 - Camera activity doesn't return an image at the requested si...(cherry picked from commit f7223357e31cbb66206a3e70dee8611d3bba0548)
Merge pull request #7802 from etiennesegonzac/bug-833982-call-fail-silent

Bug 833982 - Better call error handling when no network(cherry picked from commit 5df0c698b0c3f386b02e670a15e100a5d59ec3cd)

Conflicts:
	apps/communications/dialer/js/telephony_helper.js
bug 839552 - ignore generated file icc.json; r=fabrice
Merge pull request #8046 from mykmelez/v1-train

bug 839552 - ignore generated file icc.json; r=fabrice, a=akeybl
Merge pull request #7547 from crdlc/bug-829050

Bug 829050 - Add a config preference to allow disabling of e.me altogeth...(cherry picked from commit 050df3e9e0cfd0aa83a78485bb180e8b9c701e2c)
Merge pull request #8019 from crdlc/bug-835794

Bug 835794 - [E.me UX] [Activity Indicator] Wrong use of spinner when lo...(cherry picked from commit 4f32fca6f68ed703cb6f3a5d6d3e185fa0a25206)
Merge pull request #8018 from steveck-chung/email-activity-indicator

Bug 835410 - [Email UX] Wrong use of spinner when sending an email. r=asuth(cherry picked from commit 5d1eeacb59dbd315f7fa8337c4e73d16fde67c33)