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

Conflicts:
	Reporter/Reporter.csproj
	Reporter/Reporter.suo
	Reporter/frmPTL.cs
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferences.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/Reporter.exe
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/master' into hanhnd-w5
Merge remote-tracking branch 'origin/hanhnd-w5' into hanhnd-w5

Conflicts:
	Docs/Phong TL/BAOCAO QUY Dkt (Mau ten lua).doc
	Docs/Phong TL/~$o cao thuc luc dan.doc
	Reporter/Entities/BaseRptPPK_TLTT.cs
	Reporter/Entities/DanhMucEntities.cs
	Reporter/Entities/rptPPK_TLTT.cs
	Reporter/Entities/rptPPK_TLTT_SubBaoCaoNhanVienKT.cs
	Reporter/Entities/rptPPK_TLTT_SubKetQuaCheDay.cs
	Reporter/Entities/rptPPK_TLTT_SubKetQuaDiXuong.cs
	Reporter/Entities/rptPPK_TLTT_SubTinhHinhDanDuoc.cs
	Reporter/Entities/rptPPK_TLTT_SubTinhHinhDongBoPhao.cs
	Reporter/Entities/rptPPK_TLTT_SubTinhHinhDongBoSungBB.cs
	Reporter/Entities/rptPPK_TLTT_SubTinhHinhDongBoTLTT.cs
	Reporter/Entities/rptPTL_TLD_TL_SubTPDanTL_Petrora.cs
	Reporter/MyLib/Properties/AssemblyInfo.cs
	Reporter/MyLib/Variable.cs
	Reporter/MyLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/MyLib/obj/Debug/GenerateResource-ResGen.read.1.tlog
	Reporter/MyLib/obj/Debug/GenerateResource-ResGen.write.1.tlog
	Reporter/MyLib/obj/Debug/MyLib.csproj.FileListAbsolute.txt
	Reporter/MyLib/obj/Debug/MyLib.dll
	Reporter/MyLib/obj/Debug/MyLib.pdb
	Reporter/MyLib/obj/Debug/ResolveAssemblyReference.cache
	Reporter/Properties/AssemblyInfo.cs
	Reporter/Properties/licenses.licx
	Reporter/ReportDB.mdb
	Reporter/Reporter.csproj
	Reporter/Reporter.csproj.user
	Reporter/Reporter.suo
	Reporter/Reports/BaseReports.cs
	Reporter/Reports/PhongTenLua/rptPTL_TLD_TL_SubTPDanTL_Petrora.cs
	Reporter/Reports/PhongTenLua/rptPTL_TLD_TL_SubTPDanTL_Vonga_1.cs
	Reporter/Reports/PhongTenLua/rptPTL_TLD_TL_SubTPDanTL_Vonga_2.cs
	Reporter/Reports/rptPPK_TLTT.designer.cs
	Reporter/SubReports/PPK_TLTT_Config.Designer.cs
	Reporter/SubReports/PPK_TLTT_Config.cs
	Reporter/SubReports/PPK_TLTT_SubBaoCaoNhanVienKT.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubDinhKyNam.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubGioMoMayBQ.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubGioMoMayBQ.cs
	Reporter/SubReports/PPK_TLTT_SubHSDBKT.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubHSDBKT.cs
	Reporter/SubReports/PPK_TLTT_SubKetQuaDiXuong.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubKetQuaDiXuong.cs
	Reporter/SubReports/PPK_TLTT_SubKiemTraKyThuat.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubKiemTraKyThuat.cs
	Reporter/SubReports/PPK_TLTT_SubKiemTraKyThuat.resx
	Reporter/SubReports/PPK_TLTT_SubTinhHinhDanDuoc.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubTinhHinhDanDuoc.cs
	Reporter/SubReports/PPK_TLTT_SubTinhHinhDongBoKhiTaiQuang.Designer.cs
	Reporter/SubReports/PPK_TLTT_SubTinhHinhDongBoSungBB.Designer.cs
	Reporter/SubReports/PTL_TL_B1.Designer.cs
	Reporter/bin/Debug/C1.Win.C1FlexGrid.2.dll
	Reporter/bin/Debug/Config.txt
	Reporter/bin/Debug/MyLib.dll
	Reporter/bin/Debug/MyLib.pdb
	Reporter/bin/Debug/QLBC.log
	Reporter/bin/Debug/ReportDB.mdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	Reporter/frmMain.cs
	Reporter/frmPPK_TLTT.cs
	Reporter/frmReports.cs
	Reporter/frmTLD_TL.cs
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	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.SubReports.PPK_TLTT_SubKiemTraKyThuat.resources
	Reporter/obj/Debug/Reporter.SubReports.PTL_TL_Config.resources
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.exe
	Reporter/obj/Debug/Reporter.pdb
	Reporter/obj/Debug/Reports.rptPPK_TLTT.resources
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/reporter.exe.licenses