update
update

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