Merge commit 'aa7b584' into feature/rails3_merge

Conflicts:
	app/views/help/wiki_syntax.html.erb
Merge commit '4e1296c' into feature/rails3_merge
Merge commit '055a01b' into feature/rails3_merge
Merge commit 'f55283a' into feature/rails3_merge
deactivate the setup script for now
Merge commit '64dd7a9' into feature/rails3_merge
Merge commit '22eb508' into feature/rails3_merge
Merge commit '233d0c9' into feature/rails3_merge

Conflicts:
	Gemfile
Merge commit 'ec37b04' into feature/rails3_merge

Conflicts:
	app/models/journal.rb
	config/routes.rb
	lib/plugins/acts_as_journalized/lib/journal_formatter.rb
	test/integration/routing_test.rb
Merge commit '7a32bcd' into feature/rails3_merge
Use ActiveSupport::Inflector.transliterate should instead of I18n.transliterate
Merge commit 'd975b83' into feature/rails3_merge
Revert "Backported fix for CVE-2012-5664"

The security fix is included in newest Rails releases.

This reverts commit b6d165bd87434c590825160951a06c4edfdc412a.
Merge commit '3fcf87e' into feature/rails3_merge

Conflicts:
	config/environment.rb
	config/initializers/10-patches.rb
Merge commit 'f3d9d9b' into feature/rails3_merge

Conflicts:
	app/assets/stylesheets/default/application.css.erb
Merge commit '09c8c45' into feature/rails3_merge

Conflicts:
	app/models/mail_handler.rb
Merge commit 'f1ae269' into feature/rails3_merge
Merge commit '8bfc52a' into feature/rails3_merge
Merge commit '239cdf7' into feature/rails3_merge

Conflicts:
	app/models/mail_handler.rb
Merge commit '524aa2f' into feature/rails3_merge