Exc2
Merge branch 'static-pages'

Conflicts:
	spec/requests/static_pages_spec.rb