轮播和网站计数器
Merge branch 'master' of https://github.com/MrSaxon/tzy

Conflicts:
	protected/views/layouts/main.php
	protected/views/site/index.php