组详细画面   和   用户详细画面
Merge branch 'master' of https://github.com/r2space/TribeIOS

Conflicts:
	TribeIPhone/TribeIPhone.xcodeproj/project.pbxproj
	TribeIPhone/TribeIPhone/Views/DAContributeViewController.xib
	TribeIPhone/TribeIPhone/Views/DAGroupDetailCell.xib
Merge branch 'master' of https://github.com/r2space/TribeIOS