科室、医生和医院应用兼容问题
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/common/db/model/Department.java
	src/com/mobilenpsite/android/common/db/model/Doctor.java