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

Conflicts:
	src/com/mobilenpsite/android/core/TaskServiceManager.java
	src/com/mobilenpsite/android/ui/activity/common/YHJLDetailActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/focus/FocusFocusListActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/DetailArticleActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/HomePageDiseasesNodeActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/HomePageDoctorActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListCTActivity.java
	src/com/mobilenpsite/android/ui/base/PullRefreshActivity.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/ui/activity/common/YHJLDetailActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListCTActivity.java