Merge branch 'Yingjie'
z
Merge branch 'Yingjie'
z
Merge branch 'Yingjie'

Conflicts:
	src/config/MedicineType.js
Added comments
Merge branch 'aries'