Merge branch 'dev' into thy
change message color
Merge branch 'thy' into dev
修改了公信的逻辑，但是增加了数据量，而且message_type似乎就没什么用了……
merge
Merge branch 'dev' of github.com:JYWa/teamstyle16 into ricky