用户，组主页
Merge branch 'master' of https://github.com/r2space/TribeIOS

Conflicts:
	TribeIPhone/TribeIPhone/Views/DAGroupDetailViewController.m