Add Contact page
Refactor the StaticPages spec file
Merge branch 'add-contact-page'