Adding a combo zone and article page. Sean will make prettier
Merge pull request #1314 from darkwing/redesign-zone-article

Adding a combo zone and article page. Sean will make prettier
Fix for JSON parsing that accepts only 2-item lists
bug 889536 - mdn sphinx theme cleanup
Add tabzilla and Persona login to redesign
Add logic for left and right conditional sidebar display
Merge pull request #1318 from darkwing/redesign-tabzilla

Add tabzilla to redesign
Merge
Merge pull request #1320 from darkwing/redesign-sidebars-too

Add logic for left and right conditional sidebar display
add zone item to redesign page menu
Merge pull request #1316 from groovecoder/sphinx-theme-cleanup-889536

bug 889536 - mdn sphinx theme cleanup
Merge pull request #1321 from groovecoder/zone-menu-item-redesign

add zone item to redesign page menu
Making inline-block spacing more reliable

Conflicts:
	apps/wiki/templates/wiki/includes/document_content_redesign.html
	templates/base.html
Merge pull request #1322 from lmorchard/redesign-inline-lists-2

Making inline-block spacing more reliable
Changing tabs to spaces for redesign content
Merge pull request #1323 from darkwing/david-drinks-kool-aid

Changing tabs to spaces for redesign content
bug 862080: Tools to define and display zone nav

* (redesign only) Populate quick links sidebar from a "Quick Links"
  section in the current document, or any parent DocumentZone documents

* (redesign only) Hide any "Quick Links" section in the current
  document, since it should get moved into the sidebar

* Helpers to deal with extracting & hiding sections in document content
  (section_extract, zone_section_extract, section_hide)

* Tweak to wiki.content.{extract,replace}Section to ignore the heading
  that defines a section

* Add DocumentZone to admin dashboard, tweak unicode repr

* Tests
Misc small wiki updates, adding homepage stylesheet
Move right sidebar above article for tablet view
Override "en-US/docs/Web/" -style headings in the wiki
Fix MDN crumb