v6
v7
v8
Merge branch 'F60136240_Emergency' into dev

Conflicts:
	HelloWorld/src/com/kevingu/home/HelloWorld.java
v9
v10
v11
V12
V13
v14
v15
v16

Merge branch 'F123312_SayHello' into dev

Conflicts:
	HelloWorld/src/com/kevingu/home/AnotherJava.java
v17
V18
添加了 a="sad"
F12345678_TestChineseComment_中文注释
F60136240_RedEmergencyDrug
Read drug info from database
从数据库读取药品信息
test stash1
123456
m