Merge branch 'thy' into dev
美化了消息界面
merge nh into dev
clear some null message bugs
translate into Chinese
Merge branch 'dev' into thy