sua lai dateedit
sua lai phieu thanh toan
Merge remote-tracking branch 'origin/Branch_Hienv' into Linh_backup

Conflicts:
	DataAccess/DataAccess.csproj
	RoomManager/FormTask/frmTsk_Payment_Step1.Designer.cs
	RoomManager/FormTask/frmTsk_Payment_Step1.resx