...
cleaning...
Merge branch 'Yingjie'

Conflicts:
	src/config/MedicineType.js