Task #163: Theming button on contact-us page
Merge branch 'master' into 168