Added new Derby judges Franck and Guillaume.
Add Craig to derby judges

Conflicts:
	apps/demos/templates/demos/devderby_landing.html
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