fix bug
Merge branch 'feature_lihang' of github.com:youngshook/iSport into feature_lihang

Conflicts:
	iSport/AppDelegate.m
	iSport/CenterViewC.m