Merge remote branch 'aaronmt/march-2013-devices'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Bug 855383: Add ipv6 domain to ALLOWED_HOSTS.
Swap in another video for the flicks promo
(Bug 842314)
Update Persona privacy policy to reflect recent changes.

    Fix bug 855347.
    Fixes mozilla/browserid#3114.
    For context, see bug 848506, GH-2922, and GH-3080.
Merge pull request #711 from 6a68/persona-privacy-update

Bug 855347 update Persona privacy policy to reflect recent changes.
Bug 795546: change contribute page email for zh-CN
l10n : Bug 842122 Set up email for id contribute form
Merge pull request #717 from brianking/contribute

l10n : Bug 842122 Set up email for id contribute form
Merge pull request #715 from pascalchevrel/bug-795546-zh-CN-contributepage

Bug 795546: change contribute page email for zh-CN
Merge remote branch 'mozilla/master'
Bug 855468 - Typo on style guide
Merge pull request #718 from sgarrity/bug-855468-styleguide-typo

Bug 855468 - Typo on style guide
Merge pull request #713 from sgarrity/bug-842314-flicks-update

Swap in another video for the flicks promo
Add "Download Firefox" Facebook tab

Adds "Download Firefox" Facebook tab under /facebook/downloadtab/ URL. The tab revolves around a download button (using the new download_firefox function) but also has Facebook social integration after the download in the form of timeline shares and app invites. The third screen has cross promos for Affiliates and Facebook messenger for Firefox. There's a slightly tweaked layout of the Download Tab available under /facebook/downloadtab/noscroll/ with fixed 800px height so that the Facebook tab iframe doesn't show a vertical scrollbar.

The Download Tab requires two local settings for its Facebook integration: FACEBOOK_PAGE_NAMESPACE, the username/namespace of the Facebook page in which the tab is to be installed, and FACEBOOK_APP_ID, the app ID for the Download Tab Facebook app.

Other additions include support for decorators in mozorg.utils.page, adding a bare template for URLs like this one that aren't part of the main mozilla.org site, server-side redirects for the top frame via small JavaScript template and other Facebook-related utilities.

Fixes bug 835506.
Merge pull request #666 from Nobox/facebook-tab-download

Download Firefox Facebook Tab