add test
Merge branch 'feature/yq' of https://github.com/rickyliqi/magento3 into feature/yq

Conflicts:
	index.php