Interlink Shipping Export and discount remove from basket
Merge branch 'master' of https://github.com/rustemzsh/msbnew

Conflicts:
	var/resource_config.json