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
Merge pull request #894 from darkwing/typo-845163

fix bug 845163 - Fix typo
Merge pull request #895 from darkwing/clone-slug-845164

fix bug 845164 - Prevent slug heirarchy JS change
Merge pull request #892 from darkwing/ua-parse-647796

fix bug 647796 - shorter locales
Merge pull request #893 from darkwing/tables-843576

fix bug 843576 - Add standard-table class
Responding to relocation
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
Merge pull request #897 from lmorchard/845373-summaries-use-rendered-html

845373 summaries use rendered html
Added new Derby judges Franck and Guillaume.
Add Craig to derby judges

Conflicts:
	apps/demos/templates/demos/devderby_landing.html
Merge pull request #896 from ethertank/master

Responding to relocation
fix css gradient tutorial link
Merge pull request #900 from groovecoder/css-gradients-tutorial-link

fix css gradient tutorial link
fix bug 846209 - handle empty p elements
Merge pull request #901 from groovecoder/seo-description-empty-p-846209

fix bug 846209 - handle empty p elements