unstable coding
Merge remote-tracking branch 'origin/master'

Conflicts:
	Epicoil.Application/bin/Debug/Epicoil.Application.exe
	Epicoil.Application/bin/Debug/Epicoil.Application.pdb
	Epicoil.Application/obj/Debug/Epicoil.Application.csproj.GenerateResource.Cache
	Epicoil.Application/obj/Debug/Epicoil.Application.exe
	Epicoil.Application/obj/Debug/Epicoil.Application.pdb
no message