keep French l10n up to date
fix star alignment on topic titles
one more unused bootstrap style

I CAN SEARCH WITH REGEX MANNN
improve the category definition default copy
remove caret style, only used one place
oneboxes don't need a border-radius
better post quote description

blockquote? seriously?
Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05

keep French l10n up to date
FIX: quote reply button was wrong when there is a custom header
Merge pull request #666 from ZogStriP/fix-quote-button-position-when-custom-header

FIX: quote reply button position was wrong when there is a custom header
Initial draft. Route management still missing.
Intermediate commit to be on the safe side.
added some tests for uploads
extract hard-coded strings
First working version.
Merge branch 'custom-pages' of github.com:potthast/discourse into custom-pages

Conflicts:
	app/assets/javascripts/discourse/controllers/pages_controller.js
	app/assets/javascripts/discourse/routes/application_routes.js
	app/assets/javascripts/discourse/routes/pages_route.js
	app/controllers/pages_controller.rb
	config/routes.rb