Real teams ready with Bordeau contestants
With Bordeau pictures
Merge branch 'master' into real-teams

Conflicts:
	app.rb
Bordeau twitter
Merge branch 'master' into real-teams
Project details
Completed projects details text thanks to Anne Lacourcière translations
Merge branch 'master' into real-teams

Conflicts:
	locales/en.yml
	locales/fr.yml
Twitter link
Merge branch 'real-stuff'
Set auto-expand
Update vert repo url
Update vert repo url take 2
Bordeau -> Bordeaux
Merge branch 'real-stuff'
Add channel for special events