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

Conflicts:
	Reporter/Reporter.suo
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/Reporter.suo
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/Reporter.suo
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/Reporter.suo
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/Reporter.suo
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen

Conflicts:
	Reporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Reporter/obj/Debug/Reporter.csproj.FileListAbsolute.txt
	Reporter/obj/Debug/Reporter.pdb
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen
Merge remote-tracking branch 'origin/hanhnguyen' into hanhnguyen
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 'refs/remotes/origin/hanhnguyen' into cuongle

Conflicts:
	Reporter/MyLib/obj/Debug/ResolveAssemblyReference.cache
	Reporter/Reporter.csproj
	Reporter/Reporter.suo
	Reporter/bin/Debug/ReportDB.mdb
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	Reporter/frmReports.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
	Reporter/obj/Debug/ResolveAssemblyReference.cache
after meger (error)
meger (done)
update
udpate
meged