a
Merge remote-tracking branch 'origin/hanhnguyen-w5' into hanhnguyen-w5

Conflicts:
	Reporter/Reporter.suo
	Reporter/bin/Debug/ReportDB.mdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Reporter/obj/Debug/Reporter.exe
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'refs/remotes/origin/hanhnguyen-w5' into cuongle-w5

Conflicts:
	Reporter/Entities/DanhMucEntities.cs
	Reporter/MyLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/Reporter.csproj
	Reporter/Reports/PhongTenLua/rptPTL.designer.cs
	Reporter/Reports/PhongTenLua/rptPTL.resx
	Reporter/SubReports/PhongTenLua/PTL_TL_Config.Designer.cs
	Reporter/SubReports/PhongTenLua/PTL_TL_SubTPDanTL_Petrora.Designer.cs
	Reporter/bin/Debug/QLBC.log
	Reporter/bin/Debug/ReportDB.mdb
	Reporter/frmPTL.cs
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/GenerateResource-ResGen.read.1.tlog
	Reporter/obj/Debug/GenerateResource-ResGen.write.1.tlog
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reports.PhongTenLua.rptPTL.resources
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/reporter.exe.licenses