第一次提交
Merge branch 'script-sq'

Conflicts:
	protected/config/main.php
	protected/controllers/AdminController.php
	protected/controllers/SiteController.php
	protected/views/site/index.php
	protected/views/site/login.php