Bug 877634 - Tabzilla search input is inaccessible when in (mobile) compact mode
Bug 878448 - Use new mail address for German contribute form

Update contribute mail address for German form on Get Involved page.
Bug 879060 - Change embedded HTTP/HTTPS assets on 2011 Annual Report to protocol relative

Changed http(s):// href's and src's to //
Merge pull request #945 from chrismore/patch-2

Bug 879060 - Change embedded HTTP/HTTPS assets on 2011 Annual Report to ...
Fix Bug 873476, refresh does not trigger resubmission of form, extrenal links does not break layout, fixed font size
Port newsletter preferences to Bedrock

- Create newsletter app and move hacks.mozilla.org.html there
- Set up to display Django messages to the user.
- Make displaying most of the information on the page conditional on having a formset, so we can still use the same template when some error occurs in processing.
- Handle errors by displaying translated messages to the user. Also use Playdoh logging to log errors and debug information.
- If no token given, or token is invalid, let user supply an email
address and sign up for newsletters.
Merge pull request #915 from ossreleasefeed/bug873476-bug-fixes-to-firefoxos-take2
Redirect flicks pages firefoxflicks.mozilla.org
Bug 878926
Merge pull request #944 from craigcook/master

Bug 877931 - update home page news items
Merge pull request #946 from sgarrity/bug-878926-flicks-redirect
Merge branch 'dpoirier-bug-845904-newsletter-preference-center'

Conflicts:
	bedrock/privacy/tests/test_views.py
Fix bug 874525: Redirect NSS/* and JSS/* to MDN.

Commit 98b4668f redirected the NSS and JSS directories to MDN. This
commit additionally redirects the files and directories that live below
them to MDN.
Bug 845904: Newsletter center should be en-US only for now.
Fix newsletter rewrite rules.
Merge branch 'bug-877634-tabzilla-compact-search' of https://github.com/kyoshino/bedrock into kyoshino-bug-877634-tabzilla-compact-search
Redirect /mobile/customize for Bug 876668
Merge pull request #947 from openjck/bug-874525-redirects-1
Bug 877165 - Remove/redirect /firefox/connect page
Merge pull request #949 from sgarrity/bug-876668-redirect-mobile-customize
Merge pull request #948 from sgarrity/bug-877165-remove-connect