Hoa Don
Merge remote-tracking branch 'origin/VinhCute' into VinhCute

Conflicts:
	PresentationTier/UserControl/ucThemNhanVien.cs