Merge remote-tracking branch 'origin/origin/feature/hanhnd'

Conflicts:
	Reporter/Backup1/Entities/DanhMucEntities.cs
	Reporter/Backup1/MyLib/MyLib.csproj
	Reporter/Backup1/Reporter.csproj
	Reporter/Backup1/Reporter.suo
	Reporter/Backup1/SubReports/PPK_TLTT_Config.Designer.cs
	Reporter/Backup1/SubReports/PPK_TLTT_SubHSDBKT.Designer.cs
	Reporter/Backup1/SubReports/PPK_TLTT_SubThucLucTB.Designer.cs
	Reporter/Backup1/SubReports/PPK_TLTT_SubThuyetMinhTG.Designer.cs
	Reporter/Backup1/frmPPK_TLTT.cs
	Reporter/MyLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/MyLib/obj/Debug/GenerateResource-ResGen.read.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/Reporter.suo
	Reporter/UpgradeLog2.XML
	Reporter/bin/Debug/MyLib.dll
	Reporter/bin/Debug/MyLib.pdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	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/Reporter.exe
	Reporter/obj/Debug/Reporter.pdb
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Reporter/obj/Debug/reporter.exe.licenses
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/MyLib/obj/Debug/GenerateResource-ResGen.read.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/Reporter.suo
	Reporter/bin/Debug/MyLib.dll
	Reporter/bin/Debug/MyLib.pdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	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
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/reporter.exe.licenses
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/MyLib/obj/Debug/GenerateResource-ResGen.read.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/Reporter.suo
	Reporter/bin/Debug/MyLib.dll
	Reporter/bin/Debug/MyLib.pdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	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
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/reporter.exe.licenses
Merge remote-tracking branch 'origin/hanhnguyen' into cuongle

Conflicts:
	Reporter/Reporter.csproj
	Reporter/Reports/rptPPK_TLTT.cs
	Reporter/Reports/rptPPK_TLTT.designer.cs
	Reporter/Reports/rptPPK_TLTT.resx
	Reporter/Reports/rptPPK_TLTT_SubBaoCaoNhanVienKT.cs
	Reporter/Reports/rptPPK_TLTT_SubBaoCaoNhanVienKT.designer.cs
	Reporter/Reports/rptPPK_TLTT_SubBaoCaoNhanVienKT.resx
	Reporter/SubReports/PPK_TLTT_Config.Designer.cs
	Reporter/SubReports/PPK_TLTT_Config.cs
	Reporter/SubReports/PPK_TLTT_SubBaoCaoNhanVienKT.Designer.cs
	Reporter/bin/Debug/QLBC.log
	Reporter/bin/Debug/ReportDB.mdb
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Reporter/obj/Debug/Reports.rptPPK_TLTT.resources
	Reporter/obj/Debug/Reports.rptPPK_TLTT_SubBaoCaoNhanVienKT.resources
merge success week 1