Merge branch 'master' into gh-pages
added icon descriptions
Merge branch 'gh-pages'
fixed icons clipping