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

Conflicts:
	TribeIPhone/TribeIPhone.xcodeproj/project.pbxproj