Merge branch 'master' into spec

Conflicts:
	config/routes.rb
	spec/features/rails_production_spec.rb