小修改
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:

GameGroup/MessagePage/MessageSub/Attention/AttentionMessageViewControlle
r.m