LEJU
Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugins/PacificEpoch.Plugin.Ecommerce/JD/JDControl.cs
fIX
confilig