Merging changes with Haraldur's
Merging contact page.