zhang
Merge branch 'master' of github.com:zezcn/weike

Conflicts:
	advanced/backend/runtime/logs/app.log
	advanced/frontend/controllers/IndexController.php
	advanced/frontend/views/index/index.php
112212295