1, 首页图片随着切换上下偏移 【Fixed】
2, 用户修改弹出列表；

1, 首页图片随着切换上下偏移 【Fixed】
2, 用户修改弹出列表；
Merge commit '4f82fee4d3150b34d95ad81240cb1ce2a18dc033'
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
Math Email List
Match Email

Match Email
Match

Match
reset xcodeproj