画面调整
画面调整
Merge branch 'master' of https://github.com/r2space/TribeIOS

Conflicts:
	TribeIPhone/TribeIPhone.xcodeproj/project.pbxproj