Merge remote-tracking branch 'origin/master'

Conflicts:
	CPA/Main/bin/Debug/Main.exe
	CPA/Main/bin/Debug/Main.pdb
	CPA/Main/obj/Debug/Main.csproj.GenerateResource.Cache
	CPA/Main/obj/Debug/Main.exe
	CPA/Main/obj/Debug/Main.pdb