Update Cocos version; change fonts and minor UI changes
Merge