update
Merge branch 'master' of https://github.com/vnCreature/website
dang lam do
Merge branch 'master' of https://github.com/vnCreature/website

Conflicts:
	protected/config/main.php