新增关注模块界面，修改详情标题重复问题。
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/DiseaseDetailActivity.java
	src/com/mobilenpsite/android/MedicalDetailActivity.java
fff