5.28

在home页面显示活动列表
Merge branch 'dev-2' of https://github.com/wjling/Metic into dev-1

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard