tag
test
testing
Merge branch 'dev-2'

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

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate