获取用户信息
合并本地和远程分支
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartLife/AndroidManifest.xml
	SmartLife/gen/com/smartlife/activity/R.java
	SmartLife/res/drawable/btn_join_selector.xml
	SmartLife/res/layout/activity_group_detail.xml
	SmartLife/src/com/smartlife/adapter/SearchGroupListAdapter.java
	SmartLife/src/com/smartlife/network/NetworkConfig.java
	SmartLife/src/com/smartlife/network/params/JoinGroupParams.java
no change
Merge branch 'master' of https://github.com/SYSUsmartlife/smartlife