添加图标，改变程序名称
Merge branches 'master' and 'master' of github.com:r2space/TribeIOS

Conflicts:
	TribeIPhone/TribeIPhone.xcodeproj/project.pbxproj