change chinese char to unicode
change icons
fix chinese to unicode
Merge branch 'develop'
Merge branch 'master' into gh-pages