7.2
for test
Merge branch 'master' into dev-1
7.2
1.对发起活动过程进行了测试，消息传递基本没有问题
Merge branch 'master' into dev-1

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard
	Metic/Main Classes/MenuViewController.m