unify the font
Merge branch 'develop'