contact-us removed
conflict resolved
Merge branch 'master' into production