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

Conflicts:
	cot.php
	modules/ecombill/patient_due_first.php
Merge remote-tracking branch 'origin/master'
Tiến sửa textbox mức hưởng và download pdf