标头
Merge remote-tracking branch 'llloy/master'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_