Bug 840814: Also redirect incorrect firstrun|whatsnew URLs without locale.
Merge branch 'bug-840814-redirect-bad-firstrun-whatsnew-pages'
Update video in flicks promo (Bug 842314)
Bug 817742 - Responsify mozilla.org/persona pages
Merge pull request #663 from sgarrity/bug-842314-flicks-update

Update video in flicks promo (Bug 842314)
Merge pull request #664 from sgarrity/bug-817742-responsive-persona

Bug 817742 - Responsify mozilla.org/persona pages
Bug 848527: Add CORS header for collusion demo json file.
Merge pull request #668 from pmclanahan/bug-848527-fix-collusion-demo

Bug 848527: Add CORS header for collusion demo json file.