Merge branch 'origin/shopiteco'
Revert
Update composer.json
Merge branch 'origin/master'

Conflicts:
	composer.json