rails_productionのテストを修正
Merge branch 'master' into spec

Conflicts:
	config/routes.rb
	spec/features/rails_production_spec.rb
apache.accessのspecを修正・追加