hoi chuan 7/1
Merge branch 'master' of https://github.com/herokes/Project_BV

Conflicts:
	DB/dbthan(30-12).mwb
bien ab joi chuan ngay 8/1
Merge branch 'master' of https://github.com/herokes/Project_BV

Conflicts:
	QLBV_normal_new/QLBV_normal/NgoaitruForm.Designer.cs
Merge branch 'master' of https://github.com/herokes/Project_BV
Merge branch 'master' of https://github.com/herokes/Project_BV
modify hoichuan not perfect