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

Conflicts:
	src/com/mobilenpsite/android/common/configs/Config.java
	src/com/mobilenpsite/android/ui/activity/common/ChatActivity.java
	src/com/mobilenpsite/android/ui/activity/common/YHJLListActivity.java
	src/com/mobilenpsite/android/ui/activity/doctor/DoctorApplicationNoticeSendActivity.java
	src/com/mobilenpsite/android/ui/activity/doctor/DoctorMainPatientActivity.java
	src/com/mobilenpsite/android/ui/activity/doctor/application/questionnaire/QuestionnaireDetailActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/focus/FocusDongTaiListActivity.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/DetailDepartmentActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/DetailDiseaseActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/DetailDoctorActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/HomePageDepartmentActivity.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/HomePageNewActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListArticleActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListCTActivity.java
	src/com/mobilenpsite/android/ui/activity/user/UserLoginActivity.java
	src/com/mobilenpsite/android/ui/base/BaseActivity.java
	src/com/mobilenpsite/android/ui/base/PullRefreshActivity.java
Merge branch 'master' of github.com:Alife/Android

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

Conflicts:
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListArticleActivity.java