Fix bug 858078: Correct title of June 2013 Derby.
fix bug 849434: Add country selector to App Developer newsletter signup
fix bug 840207 - Add 'view in admin' link to documents
Merge pull request #987 from darkwing/admin-840207

fix bug 840207 - Add 'view in admin' link to documents
Use the staticfiles app to serve static media in dev
Merge pull request #986 from openjck/derby-copy-2013-04-1

Fix bug 858078: Correct title of June 2013 Derby.
LOCALE_PATHS needs to be a tuple
Merge pull request #988 from lmorchard/849434-newsletter-country

fix bug 849434: Add country selector to App Developer newsletter signup
Fix bug 845355: Adjustable depth for table of contents.
bug 849434 - update vendor with new basket submodule
Merge pull request #970 from ubernostrum/toc-limit-845355

Fix bug 845355: depth limit for table of contents
Fix bug 819704.
ToC depth front-end cleanup to match the backend.
Merge pull request #990 from groovecoder/locale-paths-tuple

LOCALE_PATHS needs to be a tuple
Corresponding CSS fix for previous.
Merge pull request #993 from ubernostrum/toc-limit-845355

ToC depth front-end cleanup to match the backend.
Merge pull request #992 from ubernostrum/security-819704

Fix bug 819704.
Merge pull request #989 from lmorchard/serve-staticfiles-in-dev

Use the staticfiles app to serve static media in dev
fix bug 858481 - toc_depth = 0 for templates
Merge pull request #994 from groovecoder/edit-template-858481

fix bug 858481 - toc_depth = 0 for templates