Set locale config to silence deprecation warning.
Merge branch 'master' into rails-3-2

Conflicts:
	config/application.rb