JD
Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugins/PacificEpoch.Plugin.Ecommerce/JD/JDControl.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugins/PacificEpoch.Plugin.Ecommerce/JD/JDControl.cs
MERGE
Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugins/PacificEpoch.Plugin.Ecommerce/JD/JDControl.cs
Fix problem
Merger
Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Libraries/PacificEpcoh.Core/Wrapper/TcpWrapper.cs
	Libraries/PacificEpoch.Services/ECommerce/JD/JDService.cs
	Plugins/PacificEpoch.Plugin.Ecommerce/JD/JDControl.cs
EW