rebuild scaffold
Fixing conflicts

Conflicts:
	index-test.php
	index.php
	protected/config/main.php
	protected/controllers/SiteController.php
	protected/tests/bootstrap.php
	protected/yiic.php