local import
Merge remote-tracking branch 'origin/master' into local

Conflicts:
	composer.json
	src/Dzangocart/Client/dzangocart.json