update
Merge branch 'master' of https://github.com/hoosin/easyItem

Conflicts:
	Config/Config_Common.php