进度条显示
未修改fragment加载中显示前
fragment加载显示
Merge remote-tracking branch 'llloy/master'
套餐医嘱还需要三个频次的参数
Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/activity/GroupDcAdviceActivity.java
bin文件
未修改headerview前
细节完善2

Change-Id: I6d9c10d94ed9b2e76e3549746fb6b99a9ba91bf1
Signed-off-by: SeaDragon King <81813780@qq.com>
增加menubutton中
menu按钮更换
更何况交换空间
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
启动画面，频次完善
gk
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/adapter/GroupDcAdviceAdapter.java
xdvfsf
Merge branch 'master' of https://github.com/81813780/Hospital.git
gyug
套餐测试