Merge branch 'gh-pages'
update the mail icon
Merge branch 'master' into gh-pages