MatchList

MatchList
Topic List

Topic List
Merge branch 'master' of https://github.com/infoyou/QiXin

Conflicts:

Application/Project/Controller/BJControllers/Coach/BJAddNewCoacheeViewCo
ntroller.m

Application/Project/Controller/BJControllers/Coach/BJAddNewCoacherViewCo
ntroller.m
	Application/Project/Controller/GlobalConstants.h
	QiXin.xcodeproj/project.pbxproj
Merge Code