gh-pages hosting branch
Merge branch 'master' into gh-pages
changed icons