前台界面重构 后台完善商家信息
前台商家信息呈现
Merge branch 'master' into robin

Conflicts:
	backend/config/main.php
	common/modules/user/views/user/registration.php
	frontend/www/themes/default/views/site/index.php