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/cuongle' into hanhnguyen

Conflicts:
	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/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.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/cuongle' into hanhnguyen

Conflicts:
	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/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.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/Reporter.suo
Merge remote-tracking branch 'origin/cuongle' into hanhnguyen

Conflicts:
	Reporter/MyLib/obj/Debug/MyLib.pdb
	Reporter/MyLib/obj/Debug/ResolveAssemblyReference.cache
	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/cuongle' into hanhnguyen

Conflicts:
	Reporter/MyLib/obj/Debug/MyLib.pdb
	Reporter/MyLib/obj/Debug/ResolveAssemblyReference.cache
	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 cuongle

Conflicts:
	Reporter/MyLib/obj/Debug/ResolveAssemblyReference.cache
	Reporter/bin/Debug/Reporter.exe
	Reporter/bin/Debug/Reporter.pdb
	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.exe
	Reporter/obj/Debug/Reporter.pdb
	Reporter/obj/Debug/ResolveAssemblyReference.cache
	Reporter/obj/Debug/reporter.exe.licenses