edit something
Merge branch 'master' of https://github.com/thanhtuan/TTTN

Conflicts:
	protected/controllers/SiteController.php