testing
Merge branch 'dev-2'

Conflicts:
	Metic/HttpSender.h
test 2
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
fix
fix
testing
Merge branch 'master' into dev-1

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
update ignore file
5.28
1. 数据库工具实现中
5.29
1. 完成了数据库操作的方法，提供了打开（创建）数据库，关闭数据库，创建表，插入，查询，删除，更新，直接执行sql语句等一些基本的数据库操作接口。
2. 进行了初步的测试都没有问题。
Merge branch 'dev-2'