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

Conflicts:
	src/com/mobilenpsite/android/common/db/dal/AbstractServices.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/ListCTActivity.java
Merge branch 'master' of github.com:Alife/Android