Swap in another video for the flicks promo
(Bug 842314)
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
Bug 835506: Fix Download Tab empty CSS.

Import of `h5bp_main.less` was breaking staging's LESS compiler (version 1.3.0), resulting in an empty compiled CSS file. Now including that file with jingo-minify instead of a LESS `@import` so that LESS files are compiled successfully.
Bug 835506: Remove @media from Download Tab CSS

Add page title too.
Merge pull request #722 from Nobox/master

Bug 835506: Remove @media from Download Tab CSS
Bug 835506: Add /b/ passthrough for facebookapps.
Bug 835506: Disable /b/ passthrough until page is fixed.
Bug 852185: Hiding contribute form for a specific locale
Merge branch 'netoarmando-bug-852185-ability-to-hide-form'
Fix bug 850431 15th Anniversary slide show on /contribute

commit from pascalc: use 15years.lang as an extra lang file for the campaign. Split a sentence in two l10n blocks because that's how I gave it to localizers

commit from jpetto: Added stub for GA tracking slide views.

Will track 3 separate actions - auto, click, keydown.

commit from jpetto: Added GA tracking code.

commit from pascalc: Bug 854232 - [zh-CN] 15 Years campaign, activate the locale

commit from craigcook: Fix validation errors in contribute form

"true" isn't a valid value for the required attribute (it's a boolean attribute)

rows and cols attributes require a positive integer value; the empty string isn't valid.
PNG optimize
0.x > .x / 0deg > 0
Merge pull request #724 from ethertank/css

Unification of some formats and image data compression
Add transaction names to page calls for newrelic differentiation.
Update marks for zh-TW and zh-CN
Merge remote-tracking branch 'craigcook/bug-850431-15-year-anniversary'

Conflicts:
	apps/mozorg/templates/mozorg/contribute.html
	apps/mozorg/views.py