5.28

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

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard
conflict fix
5.28
1. AppConstants.h : add some constants.
2. HttpSender.h : change some names of variables
5.28
1. iphone_storyboard文件修复
Merge branch 'master' into dev-1

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
using mine
test 3
ignore
Merge branch 'dev-1'

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang_mac4.xcuserdatad/UserInterfaceState.xcuserstate
	Metic.xcodeproj/xcuserdata/ligang_mac4.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Metic/AppConstants.h
	Metic/Base.lproj/Main_iPhone.storyboard
	Metic/HttpSender.m
	Metic/Main Classes/MTEvent.h
	Metic/Main Classes/MTEvent.m