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
Merge pull request #1 from craigcook/derby-judges-2013-january

Add Craig to derby judges
Fix bug 846345: Move Craig's bio for alpha order.
Merge pull request #902 from openjck/derby-judges-2013-january

Derby Judges, January to March 2013
Basic cleanup on config
Merge pull request #903 from darkwing/config-cleanup

Basic cleanup on config