Fix Bug 1090933 - Advisory titles on w.m.org/security/advisories/ should be links
Bug 1096047 - Remove l10n_has_tag conditional from firefox/os/faq template
Add 2 new FxOS partners for France. Bug 1093675.
Update Style guide for Firefox Developer Edition
Bug 1082825
Merge pull request #2479 from jpetto/bug-1093675-new-fr-fxos-purchase-links

Add 2 new FxOS partners for France. Bug 1093675.
Merge pull request #2460 from flodolo/clean_fxosfaq

Bug 1096047 - Remove l10n_has_tag conditional from firefox/os/faq template
[fix bug 1096560] Add Fx OS device avail for Movistar Alcatel One Touch Fire C in Chile
[fix bug 1096533] Update Firefox OS device avail for Alcatel One Touch Fire C in Mexico
Merge pull request #2482 from alexgibson/bug-1096560-firefox-os-chile

[fix bug 1096560] Add Fx OS device avail for Fire C in Chile and Mexico
Hide the info bar on the SUMO article.

SUMO recently turned on Tabzilla's update nag, and turned ours off.
The bug for that is Bug 1092335. Now, if a user clicks on the "Update"
button in Tabzilla, they get sent to the SUMO article, which proceeds to
nag them again. This patch hides the update bar on the target url.
Fix bug 1097154 - use 'smart' download button on fx10 page
Merge pull request #2484 from craigcook/bug-1097154-anniversary-download-button

Fix bug 1097154 - use 'smart' download button on fx10 page
Merge pull request #2444 from mythmon/patch-2

Tabzilla: Hide the info bar on the SUMO update article.
Merge pull request #2480 from sgarrity/bug-1082825-dev-styleguide

Update Style guide for Firefox Developer Edition
Merge pull request #2437 from kyoshino/bug-1090933-advisories-links

Fix Bug 1090933 - Advisory titles on w.m.org/security/advisories/ should be links
[fix bug 1096662] Version 33.1 What's new page not loading the video
Merge pull request #2483 from alexgibson/bug-1096662-whatsnew-video-uitour

[fix bug 1096662] Version 33.1 What's new page not loading the video
Remove TOS from homepage: fix bug 1094221

Restore pre-fx10 Webmaker and Appmaker promo tiles
Tweak position of Webmaker logo
Bug 1097399: Update legal-docs submodule.
Merge pull request #2487 from pmclanahan/update-legal-docs-1097399

Bug 1097399: Update legal-docs submodule.