Merge branch 'master' of D:\htdocs\git\his with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	include/care_api_classes/class_prescription.php
nang_phieulinh