Sleepy
Merge branch 'master' into static-pages

Conflicts:
	spec/requests/static_pages_spec.rb
Merged with master in order, adds Contact static page and should_not in spec