Fixed issue #14: Address 'Email us' functionality on the Contact page
Merge remote-tracking branch 'origin/email'