fix bug 647796 - shorter locales
fix bug 843576 - Add standard-table class
fix bug 845163 - Fix typo
fix bug 845164 - Prevent slug heirarchy JS change
bug 845373: Move get_seo_summary to wiki.content with similar tools
bug 845373: Add get_summary() model method to use rendered content
fix bug 845373: Use rendered content when extracting summary
Added new Derby judges Franck and Guillaume.
Add Craig to derby judges

Conflicts:
	apps/demos/templates/demos/devderby_landing.html
fix css gradient tutorial link
fix bug 846209 - handle empty p elements
Fix bug 846345: Move Craig's bio for alpha order.
Basic cleanup on config
fix bug 845890 - fix demo counts for staff users
(some) code cleanup
fix bug 779499 - remove index.php redirects
fix bug 843193: Demo censoring admin action that deletes uploads

* New censor() method in Submission model that sets the censored_url and
  deletes uploaded files. Tests.

* New admin action to censor selected demo Submissions, with optional
  censored_url field on confirmation page.

* Reworked admin action to delete selected demo submissions, calls
  Submission.delete() in order to ensure uploads also get deleted
bug 843193: demo admin pep8
Add March and May 2013 Derby copy.