as
Merge branch 'master' of github.com:hertar/weike

Conflicts:
	advanced/frontend/controllers/ShopController.php
	advanced/frontend/runtime/debug/index.data
	advanced/frontend/runtime/logs/app.log
	advanced/frontend/views/shop/shop_list.php