Merge branch 'master' into develop
fix the bugs and change fonts for icons
Merge branch 'develop'