Update static pages with temporary templates and update static pages controller test
Merge branch 'static-pages'

Conflicts:
	app/views/layouts/application.html.erb