Merge branch 'master' of github.com:Alife/Android

Conflicts:
	assets/id.json
	src/com/mobilenpsite/android/ui/activity/patient/HospitalChooseActivity.java
Merge branch 'master' of github.com:Alife/Android
Merge branch 'master' of github.com:Alife/Android
医生端添加筛选按钮可以查看我关注的和关注的用户信息。
Merge branch 'master' of github.com:Alife/Android
解决医生、科室疾病列表点击关注报错