Fix Bug 898766, use window trans to ensure search query is localizable
Remove extra parens, fix GA callback timeout. Bug 896001.
Update video.js version to 4.1.0. Refs Bug 896329.

Move Sandstone VideoJS skin to a completely independent skin based off the default skin from VideoJS 3.2.x but upgraded to work with VideoJS 4.x. Use new skin on Firefox Flicks promo.
Merge pull request #1147 from mozilla/bug-896001-ga-newsletter-calls

Remove extra parens, fix GA callback timeout. Bug 896001.
Merge pull request #1123 from gauthierm/bug-896329-videojs-upgrade

Bug 896329 VideoJS upgrade to 4.1.0
Bug 892470 : add nl+ja locales to plugincheck
[fix bug 904042] Background fade display bug on IE8 Firefox os page
Merge pull request #1139 from ossreleasefeed/bug898766-search-query-should-be-localizable

Fix Bug 898766, use window trans to ensure search query is localizable
[bug 898766] plugin search query should use https
Merge pull request #1150 from alexgibson/bug-898766-search-query-should-use-https

[bug 898766] plugin search query should use https
Merge pull request #1149 from alexgibson/fx-os-minor-ie-fixes

[fix bug 904042] Background fade display bug on IE8 Firefox os page
Merge pull request #1148 from pascalchevrel/bug892470-plugincheck_actvate_locales

Bug 892470 : add nl locale to plugincheck
Bug 904507 Home page, more horizontal space for Firefox promo text in columns
Merge pull request #1157 from pascalchevrel/Bug-904507_homepage_css_tweak_l10n

Bug 904507 Home page, promo bar, more horizontal for text in columns
Minor requirements cleanup

Remove unused django-bcrypt and its dependencies.

Update Django version in requirements.txt to 1.4.5 with explanatory
comment.

Add instruction to installation docs to install dev requirements after
compiled requirements.
Merge pull request #1158 from jgmize/minor-requirements-cleanup

Minor requirements cleanup
Fix Bug 903089 - robots.txt changes

In production, add the following line to robots.txt:

disallow: /*/newsletter/existing/*

In dev, staging, etc:

user-agent: *
disallow: *

settings.SITE_URL is used to determine if we are in production.

In etc/httpd/global.conf, add a RewriteRule to serve robots.txt from
Django.

Add robots.txt to settings.SUPPORTED_NONLOCALES to eliminate redirect.
Bug 904237  Update persona.html and persona.less
Copy changes to focus on sign-in-with-email behavior of Persona
Made relying party example block generic, named it rp-example (from previous RP used trovebox)
Merge pull request #1156 from jgmize/bug-903089-newsletter-robots

Fix Bug 903089 - robots.txt changes
/robots.txt Content-Type: text/plain