查看群组申请功能完成一半，等待后台接口修复
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartLife/AndroidManifest.xml
	SmartLife/gen/com/smartlife/activity/R.java
	SmartLife/src/com/smartlife/activity/GroupDetailActivity.java