Merge branch 'gh-pages' into develop
add ico
Merge branch 'develop' into gh-pages