Merge branch 'master' of https://github.com/reedpro/KS_EMS

Conflicts:
	EMS/bin/Debug/EMS.exe
	EMS/bin/Debug/EMS.pdb
	EMS/bin/Debug/Presentation.dll
	EMS/bin/Debug/Presentation.pdb
	EMS/bin/Debug/TheCompany.dll
	EMS/bin/Debug/TheCompany.pdb
	EMS/obj/Debug/EMS.csprojResolveAssemblyReference.cache
	EMS/obj/Debug/EMS.exe
	EMS/obj/Debug/EMS.pdb
	Presentation/bin/Debug/Presentation.dll
	Presentation/bin/Debug/Presentation.pdb
	Presentation/bin/Debug/TheCompany.dll
	Presentation/bin/Debug/TheCompany.pdb

	Presentation/obj/Debug/Presentation.csprojResolveAssemblyReference.cache
	Presentation/obj/Debug/Presentation.dll
	TheCompany/bin/Debug/TheCompany.dll
	TheCompany/bin/Debug/TheCompany.pdb
	TheCompany/obj/Debug/TheCompany.dll
	TheCompany/obj/Debug/TheCompany.pdb