Toa thuoc
Merge branch 'master' of https://github.com/herokes/Project_BV

Conflicts:
	QLBV_normal_new/QLBV_normal/NgoaitruForm.Designer.cs
	QLBV_normal_new/QLBV_normal/Report/Toathuoc.rpt
	QLBV_normal_new/QLBV_normal/ReportForm.cs