7.6
消息中心改动进行中
7.8
1. 消息中心逻辑修改和ui整合
2. 用android发送活动和好友请求，iOS端可以正确接受显示并反馈
7.9
1. 消息中心UI和逻辑改完
Merge branch 'dev-1'

Conflicts:
	Metic.xcodeproj/project.pbxproj
	Metic/Base.lproj/Main_iPhone.storyboard
	Metic/Main Classes/LoginViewController.m
7.9
merge fix
Merge branch 'dev-2'

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard