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
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/core/TaskServiceManager.java
	src/com/mobilenpsite/android/ui/activity/patient/PatientMainBottomActivity.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/core/TaskServiceManager.java
修改若干问题