for goods
Merge branch 'master' of https://github.com/huiguilin/trunk

Conflicts:
	App/Runtime/Cache/Home/5af3b772512f93bbed89b40e875139eb.php