comment unuse slide javascript
Merge branch 'master' of https://github.com/huskycode/thsea.git

Conflicts:
	public/protected/views/site/index.php
Merge branch 'master' of https://github.com/huskycode/thsea.git

Conflicts:
	public/protected/views/site/index.php