Add new routing tests
Merge branch 'RSpec-tests' into Routing

Conflicts:
	spec/requests/static_pages_spec.rb