Merge commit 'gitorious/master'

Conflicts:

	app/controllers/application.rb
	app/helpers/application_helper.rb
	config/boot.rb
	config/environment.rb
	config/environments/production.rb
	config/routes.rb
	public/javascripts/application.js