Bug 852589: Add dev-only page to display all download buttons.
Bug 856081 redirecting /about/drivers to the wiki
Bug 795033: Add Besnik email as contact point for fy-NL contribute page, activate MOZ15 flag
Bug 795033: Add Serbian email contact for contribute page
Bug 849426: Port /about/history.html to bedrock

- new pages created on wiki with old content of some pages:
  - www.mozilla.org/about/bookmarks.html ->
           https://wiki.mozilla.org/Historical_Documents
  - www.mozilla.org/about/timeline.html ->
           https://wiki.mozilla.org/Timeline
- new /about/history/ page on bedrock with existing content from
  old /about/history.html, and links to new wiki pages
- added rewrite rules so new history page is served from bedrock and old
  bookmarks and timeline pages redirect to the new wiki pages
- used about-base.html template for history page
- Added some more information to the install doc about getting the PHP
  and Bedrock sides of the site running locally with Apache.
- Make about.less import about-base.less and then add mosaic to it,
  so it's clear that the only difference is the mosaic.
Merge pull request #714 from dpoirier/bug-849426-about-history

Bug 849426 - port  mozilla.org/about/history.html to bedrock
Various l10n fixes for /firefox/new
* remove an unused span tag in title while we already have the string without this tag localized
* add typographic quotes in a sentence because we have that string with those quotes
* split a string into 2 strings we already have
* make alt text and page title translatable
* remove white space in string to facilitate conversion of existing strings
Merge pull request #767 from pascalchevrel/firefox_new_various_l10n_fixes

Various l10n fixes for /firefox/new
Add spam prevention features. Bug 843789.

- Added general use honeypot widget
- Added CSRF to /firefox/partners & /about/partnerships
- Added labels to /firefox/partners form
- Added required field to /collusion form
- Updated /apps/firefox/tests.py to play with updated proxy
Merge pull request #745 from retornam/bug-856081-redirect-about-page

Bug 856081 redirecting /about/drivers to the wiki
Merge pull request #768 from jpetto/bug-843789-spam-prevention

Add spam prevention features. Bug 843789.
Merge pull request #754 from pascalchevrel/bug-796066-sr-contribute-page

Bug 795033: Add Serbian email contact for contribute page
Merge PR #753 from branch 'pascalchevrel/bug-795033-sq-contribute-page'

Conflicts:
	apps/mozorg/email_contribute.py
	settings/base.py
Merge pull request #694 from pmclanahan/bug-852589-add-dev-all-buttons-page

Bug 852589: Add dev-only page to display all download buttons.
Bug 797192 - some CSS fixes for plugincheck page

Adjusted column widths and margins.
Improved responsiveness.
Merge pull request #770 from craigcook/master

 Bug 797192 - some CSS fixes for plugincheck page
Bug 861163 - gettext errors at extraction caused by empty gettext calls
Merge pull request #772 from pascalchevrel/bug-861163_fix_gettext_extraction_error_messages

Bug 861163 - gettext errors at extraction caused by empty gettext calls
Bug 860991 - Firefox persona preview broke
Merge pull request #773 from chrismore/patch-5

Bug 860991 - Firefox persona preview broke