change "contact us" link
Merge branch 'develop'
Merge branch 'master' into gh-pages