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

Conflicts:
	src/com/mobilenpsite/android/core/ServiceManager.java
	src/com/mobilenpsite/android/core/TaskServiceManager.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/core/TaskServiceManager.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/DetailCommonActivity.java
修改底部顶部导航栏
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/core/AppUpgradeService.java
	src/com/mobilenpsite/android/ui/activity/common/ChatActivity.java
	src/com/mobilenpsite/android/ui/activity/patient/homepage/ListCTActivity.java
	src/com/mobilenpsite/android/ui/base/BaseActivity.java