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

Conflicts:
	src/com/mobilenpsite/android/ChatActivity.java
dd
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/ui/common/ChatActivity.java
Merge branch 'master' of github.com:Alife/Android
医生客户端和患者客户端整合