Fix Bug 981878 - Add Portland, San Francisco and Vancouver MozSpaces guidelines
Merge pull request #1769 from kyoshino/bug-981878-spaces-guidelines

Fix Bug 981878 - Add Portland, San Francisco and Vancouver MozSpaces guidelines
Fix CSS bugs on /firefox/os/. Bug 981953.
Merge pull request #1770 from jpetto/bug-981953-fxos-ie8-css-bugs

Fix CSS bugs on /firefox/os/. Bug 981953.
Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5

Upgrades a number of things:

* 83cee01 Merge pull request #59 from peterbe/upgrade-test_utils
* 57c1b29 upgrade test_utils
* ce50051 Merge pull request #58 from glogiotatidis/master
* 19e16ab Upgrade test-utils to support Django 1.5.
* ee0b875 Merge pull request #57 from pmclanahan/upgrade-django-nose
* b5273fe Upgrade django-nose
* 1117ecc Merge pull request #56 from willkg/update-funfactory
* 6bc7ee1 Update funfactory to latest master tip
* f4936a8 Update jingo to latest master tip (5e985a5)
* 892ed74 Update to Django 1.5.5
* 2c89fe7 Upgrade bleach to 1.2.2
* db88c21 Django 1.4.10, r=willkg
* 94dcac7 Merge pull request #53 from willkg/remove-schematic-2
* c66e513 Remove schematic submodule
* 2ad6d1e Merge pull request #50 from willkg/sort-vendorpth
* 16d21ce Cosmetic: Resort vendor.pth
* 707fdfc updating django-mobility and django-multidb-router
* 4d482c3 Merge pull request #49 from akatsoulas/update-funfactory
* 730f35d Update funfactory to latest master.
* 65d7a52 upgrade to django-browserid 0.9
* a1def31 Merge pull request #47 from pmclanahan/update-funfactory
* 9b22ad9 Update funfactory to latest master.

Also removes reliance on deprecated things:

* django.conf.urls.defaults
* verify_exists kwarg on UrlField
Merge pull request #1764 from pmclanahan/upgrade-playdoh-lib-django-1.5

Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5
Fix bug 982755: Fix POT file conversion when string ends with quote.
Merge pull request #1774 from pmclanahan/fix-pot-to-langfile-982755

Fix bug 982755: Fix POT file conversion when string ends with quote.
Bug 981092 - Update /gigabit copy according to the given text on google doc
HTML structure changes
Fix merge conflict