配置
Merge branch 'master' of https://github.com/iStove/ireoo

Conflicts:
	include/store/goods.php