Merge remote-tracking branch 'origin/master'

Conflicts:
	EMS.v12.suo
	EMS/bin/Debug/EMS.exe
	EMS/bin/Debug/EMS.pdb
	EMS/bin/Debug/Presentation.dll
	EMS/bin/Debug/Presentation.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/obj/Debug/Presentation.dll