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

Conflicts:
	src/com/mobilenpsite/android/ui/activity/patient/focus/FocusFocusListActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/HomePageDepartmentActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/HomePageDoctorActivity.java
	src/com/mobilenpsite/android/ui/adapter/DDDBaseAdapter.java
Merge branch 'master' of github.com:Alife/Android