Add 60px shortcut icon
Merge branch 'master' into gh-pages